+
+
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactMerge.vue b/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactMerge.vue
index d569ae900..1d019ff80 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactMerge.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactMerge.vue
@@ -103,7 +103,7 @@ const onMergeContacts = async () => {
-
+
+ + {{ t('CONVERSATION_SIDEBAR.SHARED_FILES.EMPTY') }} +
+
+
+
+
{{ t('CONTACTS_LAYOUT.SIDEBAR.MERGE.TITLE') }}
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactNotes.vue b/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactNotes.vue
index 789aba1c8..218a1293f 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactNotes.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactNotes.vue
@@ -55,7 +55,7 @@ useKeyboardEvents(keyboardEvents);
-
{{ t('CONTACTS_LAYOUT.SIDEBAR.MERGE.TITLE') }}
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactNotes.vue b/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactNotes.vue
index 789aba1c8..218a1293f 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactNotes.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsSidebar/ContactNotes.vue
@@ -55,7 +55,7 @@ useKeyboardEvents(keyboardEvents);
-
+
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useAlert } from 'dashboard/composables';
+import { formatBytes } from 'shared/helpers/FileHelper';
+import { dynamicTime, shortTimestamp } from 'shared/helpers/timeHelper';
+import { downloadFile } from '@chatwoot/utils';
+import {
+ MEDIA_TYPES,
+ NON_FILE_TYPES,
+} from 'dashboard/components-next/message/constants';
+
+import FileIcon from 'next/icon/FileIcon.vue';
+import NextButton from 'dashboard/components-next/button/Button.vue';
+
+const props = defineProps({
+ attachments: { type: Array, default: () => [] },
+ peekLimit: { type: Number, default: 0 },
+ showJumpToMessage: { type: Boolean, default: false },
+});
+
+const emit = defineEmits(['select', 'jumpToMessage']);
+
+const { t } = useI18n();
+
+const fileAttachments = computed(() =>
+ [...props.attachments]
+ .filter(
+ a =>
+ a.data_url &&
+ !MEDIA_TYPES.includes(a.file_type) &&
+ !NON_FILE_TYPES.includes(a.file_type)
+ )
+ .sort((a, b) => (b.created_at || 0) - (a.created_at || 0))
+);
+
+const showAll = ref(false);
+const downloadingId = ref(null);
+
+const isPeekable = computed(() => props.peekLimit > 0);
+
+const visibleFiles = computed(() => {
+ if (!isPeekable.value || showAll.value) return fileAttachments.value;
+ return fileAttachments.value.slice(0, props.peekLimit);
+});
+
+const fileNameFromUrl = url => {
+ if (!url) return '';
+ const name = url.split('/').pop();
+ return name ? decodeURIComponent(name) : '';
+};
+
+const displayName = attachment =>
+ fileNameFromUrl(attachment.data_url) ||
+ t('CONVERSATION_SIDEBAR.SHARED_FILES.UNTITLED_FILE');
+
+const displaySize = attachment => {
+ if (attachment.file_size) return formatBytes(attachment.file_size);
+ if (attachment.extension) return attachment.extension.toUpperCase();
+ return '—';
+};
+
+const displayTime = attachment => {
+ if (!attachment.created_at) return '';
+ return shortTimestamp(dynamicTime(attachment.created_at), true);
+};
+
+const onActivate = attachment => emit('select', attachment);
+
+const onDownloadFile = async attachment => {
+ const { id, file_type: type, data_url: url, extension } = attachment;
+ try {
+ downloadingId.value = id;
+ await downloadFile({ url, type, extension });
+ } catch (error) {
+ useAlert(t('CONVERSATION_SIDEBAR.SHARED_FILES.DOWNLOAD_ERROR'));
+ } finally {
+ downloadingId.value = null;
+ }
+};
+
+
+
+
+
+
+ {{ t('CONVERSATION_SIDEBAR.SHARED_FILES.FILES_HEADING') }}
+
+ {{ fileAttachments.length }}
+
+
+
+
+ -
+
+
+ {{ displayName(attachment) }}
+
+
+ {{ displaySize(attachment) }}
+
+ · {{ displayTime(attachment) }}
+
+
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/SharedAttachments/Media.vue b/app/javascript/dashboard/components-next/SharedAttachments/Media.vue
new file mode 100644
index 000000000..6a3875583
--- /dev/null
+++ b/app/javascript/dashboard/components-next/SharedAttachments/Media.vue
@@ -0,0 +1,305 @@
+
+
+
+
+
+
+ {{ t('CONVERSATION_SIDEBAR.SHARED_FILES.MEDIA_HEADING') }}
+
+ {{ mediaAttachments.length }}
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/message/constants.js b/app/javascript/dashboard/components-next/message/constants.js
index 4f8b4f23c..517c083a1 100644
--- a/app/javascript/dashboard/components-next/message/constants.js
+++ b/app/javascript/dashboard/components-next/message/constants.js
@@ -78,6 +78,12 @@ export const MEDIA_TYPES = [
ATTACHMENT_TYPES.IG_REEL,
];
+export const NON_FILE_TYPES = [
+ ATTACHMENT_TYPES.LOCATION,
+ ATTACHMENT_TYPES.FALLBACK,
+ ATTACHMENT_TYPES.CONTACT,
+];
+
export const VOICE_CALL_STATUS = {
IN_PROGRESS: 'in-progress',
RINGING: 'ringing',
diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index 8d0b73dfc..1a10b253f 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -511,6 +511,7 @@
"ATTRIBUTES": "Attributes",
"HISTORY": "History",
"NOTES": "Notes",
+ "MEDIA": "Media",
"MERGE": "Merge"
},
"HISTORY": {
diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index 3eb83fd31..045b8d0d9 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -401,7 +401,8 @@
"VIEW_ALL": "View all",
"SHOW_LESS": "Show less",
"MORE_COUNT": "+{count}",
- "UNTITLED_FILE": "Untitled file"
+ "UNTITLED_FILE": "Untitled file",
+ "JUMP_TO_MESSAGE": "Jump to message"
},
"SHOPIFY": {
"ORDER_ID": "Order #{id}",
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue b/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue
index fe23e23d3..05142bb82 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/pages/ContactManageView.vue
@@ -11,6 +11,7 @@ import ContactDetails from 'dashboard/components-next/Contacts/Pages/ContactDeta
import TabBar from 'dashboard/components-next/tabbar/TabBar.vue';
import ContactNotes from 'dashboard/components-next/Contacts/ContactsSidebar/ContactNotes.vue';
import ContactHistory from 'dashboard/components-next/Contacts/ContactsSidebar/ContactHistory.vue';
+import ContactMedia from 'dashboard/components-next/Contacts/ContactsSidebar/ContactMedia.vue';
import ContactMerge from 'dashboard/components-next/Contacts/ContactsSidebar/ContactMerge.vue';
import ContactCustomAttributes from 'dashboard/components-next/Contacts/ContactsSidebar/ContactCustomAttributes.vue';
@@ -40,6 +41,7 @@ const CONTACT_TABS_OPTIONS = [
{ key: 'ATTRIBUTES', value: 'attributes' },
{ key: 'HISTORY', value: 'history' },
{ key: 'NOTES', value: 'notes' },
+ { key: 'MEDIA', value: 'media' },
{ key: 'MERGE', value: 'merge' },
];
@@ -149,8 +151,8 @@ onMounted(() => {
:selected-contact="selectedContact"
@go-to-contacts-list="goToContactsList"
/>
-
-
+
+
{
@tab-changed="handleTabChange"
/>
+
+
{
/>
- [...allAttachments.value].sort(
- (a, b) => (b.created_at || 0) - (a.created_at || 0)
- )
-);
+const { t } = useI18n();
const mediaAttachments = computed(() =>
- sortedAttachments.value.filter(a => MEDIA_TYPES.includes(a.file_type))
+ allAttachments.value
+ .filter(a => MEDIA_TYPES.includes(a.file_type) && a.data_url)
+ .sort((a, b) => (b.created_at || 0) - (a.created_at || 0))
);
-const fileAttachments = computed(() =>
- sortedAttachments.value.filter(
- a => !MEDIA_TYPES.includes(a.file_type) && a.data_url
+const hasContent = computed(() =>
+ allAttachments.value.some(
+ a => a.data_url && !NON_FILE_TYPES.includes(a.file_type)
)
);
-const showAllMedia = ref(false);
-const showAllFiles = ref(false);
-
-const visibleMedia = computed(() =>
- showAllMedia.value
- ? mediaAttachments.value
- : mediaAttachments.value.slice(0, MEDIA_PEEK_LIMIT)
-);
-
-const visibleFiles = computed(() =>
- showAllFiles.value
- ? fileAttachments.value
- : fileAttachments.value.slice(0, FILES_PEEK_LIMIT)
-);
-
-const mediaOverflow = computed(() => {
- const total = mediaAttachments.value.length;
- return total > MEDIA_PEEK_LIMIT ? total - (MEDIA_PEEK_LIMIT - 1) : 0;
-});
-
const showGallery = ref(false);
const selectedAttachment = ref(null);
-const downloadingId = ref(null);
-const fileNameFromUrl = url => {
- if (!url) return '';
- const name = url.split('/').pop();
- return name ? decodeURIComponent(name) : '';
-};
-
-const onDownloadFile = async attachment => {
- const { id, file_type: type, data_url: url, extension } = attachment;
- try {
- downloadingId.value = id;
- await downloadFile({ url, type, extension });
- } catch (error) {
- useAlert(t('CONVERSATION_SIDEBAR.SHARED_FILES.DOWNLOAD_ERROR'));
- } finally {
- downloadingId.value = null;
- }
-};
-
-const isVideoType = type =>
- [ATTACHMENT_TYPES.VIDEO, ATTACHMENT_TYPES.IG_REEL].includes(type);
-
-const isAudioType = type => type === ATTACHMENT_TYPES.AUDIO;
-const isPlayableType = type => isVideoType(type) || isAudioType(type);
-
-const durations = ref({});
-
-const onLoadedMetadata = (attachment, event) => {
- const seconds = event.target?.duration;
- if (Number.isFinite(seconds) && seconds > 0) {
- durations.value[attachment.id] = seconds;
- }
-};
-
-const displayDuration = attachment => {
- const seconds = durations.value[attachment.id];
- return seconds ? formatDuration(Math.round(seconds)) : '';
-};
-
-const isOverflowTile = index =>
- !showAllMedia.value &&
- mediaOverflow.value > 0 &&
- index === MEDIA_PEEK_LIMIT - 1;
-
-const onTileActivate = (attachment, index) => {
- if (isOverflowTile(index)) {
- showAllMedia.value = true;
- return;
- }
+const onMediaSelect = attachment => {
selectedAttachment.value = attachment;
showGallery.value = true;
};
-const failedThumbs = ref(new Set());
-const failedPreviews = ref(new Set());
-
-const imagePreviewSrc = ({
- id,
- file_type: type,
- thumb_url: thumbUrl,
- data_url: dataUrl,
-}) => {
- const canUseThumb = thumbUrl && !failedThumbs.value.has(id);
- if (type === ATTACHMENT_TYPES.IMAGE) return canUseThumb ? thumbUrl : dataUrl;
- if (isVideoType(type)) return canUseThumb ? thumbUrl : null;
- return null;
-};
-
-const onPreviewError = ({
- id,
- file_type: type,
- thumb_url: thumbUrl,
- data_url: dataUrl,
-}) => {
- const canRetryWithFull = thumbUrl && !failedThumbs.value.has(id) && dataUrl;
- if (
- canRetryWithFull &&
- (type === ATTACHMENT_TYPES.IMAGE || isVideoType(type))
- ) {
- failedThumbs.value.add(id);
- return;
+const onFileSelect = attachment => {
+ if (attachment.data_url) {
+ window.open(attachment.data_url, '_blank', 'noopener,noreferrer');
}
- failedPreviews.value.add(id);
-};
-
-const hasPreview = attachment =>
- !!imagePreviewSrc(attachment) && !failedPreviews.value.has(attachment.id);
-const hasVideoPreview = attachment =>
- isVideoType(attachment.file_type) &&
- attachment.data_url &&
- !failedPreviews.value.has(attachment.id);
-
-const fallbackIcon = type => {
- if (type === ATTACHMENT_TYPES.AUDIO) return 'i-lucide-music';
- if (isVideoType(type)) return 'i-lucide-video';
- return 'i-lucide-image';
-};
-
-const displayName = attachment =>
- fileNameFromUrl(attachment.data_url) ||
- t('CONVERSATION_SIDEBAR.SHARED_FILES.UNTITLED_FILE');
-
-const displaySize = attachment => {
- if (attachment.file_size) return formatBytes(attachment.file_size);
- if (attachment.extension) return attachment.extension.toUpperCase();
- return '—';
-};
-
-const displayTime = attachment => {
- if (!attachment.created_at) return '';
- return shortTimestamp(dynamicTime(attachment.created_at), true);
};
-
+
+
{{ t('CONVERSATION_SIDEBAR.SHARED_FILES.EMPTY') }}
-
-
-
-
- {{ t('CONVERSATION_SIDEBAR.SHARED_FILES.MEDIA_HEADING') }}
-
- {{ mediaAttachments.length }}
-
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
- {{ t('CONVERSATION_SIDEBAR.SHARED_FILES.FILES_HEADING') }}
-
- {{ fileAttachments.length }}
-
-
-
-
-
-
+
+ {
const formData = new FormData();
@@ -114,6 +114,19 @@ export const actions = {
}
},
+ fetchAttachments: async ({ commit }, id) => {
+ commit(types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: true });
+ try {
+ const response = await ContactAPI.getAttachments(id);
+ commit(types.SET_CONTACT_ATTACHMENTS, {
+ id,
+ data: response.data.payload,
+ });
+ } finally {
+ commit(types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: false });
+ }
+ },
+
update: async ({ commit }, { id, isFormData = false, ...contactParams }) => {
const { avatar, customAttributes, ...paramsToDecamelize } = contactParams;
const decamelizedContactParams = {
diff --git a/app/javascript/dashboard/store/modules/contacts/getters.js b/app/javascript/dashboard/store/modules/contacts/getters.js
index 5a75ac091..425ba9449 100644
--- a/app/javascript/dashboard/store/modules/contacts/getters.js
+++ b/app/javascript/dashboard/store/modules/contacts/getters.js
@@ -24,6 +24,7 @@ export const getters = {
stopPaths: ['custom_attributes'],
});
},
+ getContactAttachments: $state => id => $state.records[id]?.attachments || [],
getMeta: $state => {
return $state.meta;
},
diff --git a/app/javascript/dashboard/store/modules/contacts/mutations.js b/app/javascript/dashboard/store/modules/contacts/mutations.js
index 5eef7e2b3..5fbd04ed1 100644
--- a/app/javascript/dashboard/store/modules/contacts/mutations.js
+++ b/app/javascript/dashboard/store/modules/contacts/mutations.js
@@ -58,7 +58,15 @@ export const mutations = {
},
[types.EDIT_CONTACT]: ($state, data) => {
- $state.records[data.id] = data;
+ const existingAttachments = $state.records[data.id]?.attachments;
+ $state.records[data.id] = existingAttachments
+ ? { ...data, attachments: existingAttachments }
+ : data;
+ },
+
+ [types.SET_CONTACT_ATTACHMENTS]: ($state, { id, data }) => {
+ if (!$state.records[id]) $state.records[id] = {};
+ $state.records[id].attachments = data;
},
[types.DELETE_CONTACT]: ($state, id) => {
diff --git a/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js b/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js
index 00b7bb83b..bb2f0393b 100644
--- a/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js
@@ -438,4 +438,48 @@ describe('#actions', () => {
]);
});
});
+
+ describe('#fetchAttachments', () => {
+ const attachments = [
+ { id: 11, message_id: 21, file_type: 'image' },
+ { id: 12, message_id: 22, file_type: 'file' },
+ ];
+
+ it('fetches and stores attachments on the contact record', async () => {
+ axios.get.mockResolvedValue({ data: { payload: attachments } });
+ const state = { records: { 1: { id: 1 } } };
+ await actions.fetchAttachments({ commit, state }, 1);
+ expect(commit.mock.calls).toEqual([
+ [types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: true }],
+ [types.SET_CONTACT_ATTACHMENTS, { id: 1, data: attachments }],
+ [types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: false }],
+ ]);
+ });
+
+ it('refetches even when attachments are already cached', async () => {
+ axios.get.mockResolvedValue({ data: { payload: attachments } });
+ const state = {
+ records: { 1: { id: 1, attachments: [{ id: 99 }] } },
+ };
+ await actions.fetchAttachments({ commit, state }, 1);
+ expect(axios.get).toHaveBeenCalled();
+ expect(commit.mock.calls).toEqual([
+ [types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: true }],
+ [types.SET_CONTACT_ATTACHMENTS, { id: 1, data: attachments }],
+ [types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: false }],
+ ]);
+ });
+
+ it('clears the loading flag and rethrows when the API errors', async () => {
+ axios.get.mockRejectedValue(new Error('Network error'));
+ const state = { records: { 1: { id: 1 } } };
+ await expect(
+ actions.fetchAttachments({ commit, state }, 1)
+ ).rejects.toThrow('Network error');
+ expect(commit.mock.calls).toEqual([
+ [types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: true }],
+ [types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: false }],
+ ]);
+ });
+ });
});
diff --git a/app/javascript/dashboard/store/modules/specs/contacts/getters.spec.js b/app/javascript/dashboard/store/modules/specs/contacts/getters.spec.js
index 38973ec9d..260ca8f2a 100644
--- a/app/javascript/dashboard/store/modules/specs/contacts/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/contacts/getters.spec.js
@@ -50,4 +50,22 @@ describe('#getters', () => {
};
expect(getters.getAppliedContactFilters(state)).toEqual(filters);
});
+
+ describe('getContactAttachments', () => {
+ it('returns the attachments stored on the contact record', () => {
+ const data = [{ id: 11, file_type: 'image' }];
+ const state = { records: { 1: { id: 1, attachments: data } } };
+ expect(getters.getContactAttachments(state)(1)).toEqual(data);
+ });
+
+ it('returns an empty array when the contact has no cached attachments', () => {
+ const state = { records: { 1: { id: 1 } } };
+ expect(getters.getContactAttachments(state)(1)).toEqual([]);
+ });
+
+ it('returns an empty array when the contact is not in the store', () => {
+ const state = { records: {} };
+ expect(getters.getContactAttachments(state)(99)).toEqual([]);
+ });
+ });
});
diff --git a/app/javascript/dashboard/store/modules/specs/contacts/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/contacts/mutations.spec.js
index 4eb40ff61..962cc6ea4 100644
--- a/app/javascript/dashboard/store/modules/specs/contacts/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/contacts/mutations.spec.js
@@ -63,6 +63,21 @@ describe('#mutations', () => {
1: { id: 1, name: 'contact2', email: 'contact2@chatwoot.com' },
});
});
+
+ it('preserves a cached attachments list across edits', () => {
+ const attachments = [{ id: 11, file_type: 'image' }];
+ const state = {
+ records: {
+ 1: { id: 1, name: 'contact1', attachments },
+ },
+ };
+ mutations[types.EDIT_CONTACT](state, { id: 1, name: 'contact2' });
+ expect(state.records[1]).toEqual({
+ id: 1,
+ name: 'contact2',
+ attachments,
+ });
+ });
});
describe('#SET_CONTACT_FILTERS', () => {
@@ -102,4 +117,33 @@ describe('#mutations', () => {
expect(state.appliedFilters).toEqual([]);
});
});
+
+ describe('#SET_CONTACT_ATTACHMENTS', () => {
+ it('attaches the list to the existing contact record', () => {
+ const state = { records: { 1: { id: 1, name: 'Sivin' } } };
+ const data = [{ id: 11, file_type: 'image' }];
+ mutations[types.SET_CONTACT_ATTACHMENTS](state, { id: 1, data });
+ expect(state.records[1]).toEqual({
+ id: 1,
+ name: 'Sivin',
+ attachments: data,
+ });
+ });
+
+ it('creates a record shell when the contact is not yet loaded', () => {
+ const state = { records: {} };
+ const data = [{ id: 12, file_type: 'file' }];
+ mutations[types.SET_CONTACT_ATTACHMENTS](state, { id: 5, data });
+ expect(state.records[5]).toEqual({ attachments: data });
+ });
+
+ it('replaces an existing attachment list', () => {
+ const state = {
+ records: { 1: { id: 1, attachments: [{ id: 99 }] } },
+ };
+ const data = [{ id: 11 }];
+ mutations[types.SET_CONTACT_ATTACHMENTS](state, { id: 1, data });
+ expect(state.records[1].attachments).toEqual(data);
+ });
+ });
});
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 1597b7ea6..059d9636e 100644
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -139,6 +139,7 @@ export default {
SET_CONTACT_META: 'SET_CONTACT_META',
SET_CONTACT_UI_FLAG: 'SET_CONTACT_UI_FLAG',
SET_CONTACT_ITEM: 'SET_CONTACT_ITEM',
+ SET_CONTACT_ATTACHMENTS: 'SET_CONTACT_ATTACHMENTS',
SET_CONTACTS: 'SET_CONTACTS',
APPEND_CONTACTS: 'APPEND_CONTACTS',
CLEAR_CONTACTS: 'CLEAR_CONTACTS',
From ee6382109ad3fafdb7aaa51257be0f11fb801fc7 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan
Date: Mon, 15 Jun 2026 17:06:40 +0530
Subject: [PATCH 02/26] feat: prevent deleted email conversations from syncing
again (#14612)
# Pull Request Template
## Description
Prevent deleted email conversations from being synced into Chatwoot
again while they are still within the IMAP sync window.
When an admin explicitly deletes an email conversation, the incoming
email message IDs are stored temporarily in Redis. IMAP sync checks
these recently deleted message IDs in addition to existing message
records. Each Redis key expires automatically after two days.
This applies only to explicit conversation deletion. Individual message
deletion, inbox deletion, and account deletion keep their existing
behavior.
Fixes
[CW-7214](https://linear.app/chatwoot/issue/CW-7214/deleted-mails-in-gmail-inbox-gets-synced-again)
---
.../v1/accounts/conversations_controller.rb | 2 +-
app/services/conversations/delete_service.rb | 16 +++++++++
app/services/imap/base_fetch_email_service.rb | 6 +++-
app/services/imap/deleted_message_tracker.rb | 28 +++++++++++++++
lib/redis/redis_keys.rb | 2 ++
.../conversations/delete_service_spec.rb | 35 +++++++++++++++++++
.../services/imap/fetch_email_service_spec.rb | 22 ++++++++++++
7 files changed, 109 insertions(+), 2 deletions(-)
create mode 100644 app/services/conversations/delete_service.rb
create mode 100644 app/services/imap/deleted_message_tracker.rb
create mode 100644 spec/services/conversations/delete_service_spec.rb
diff --git a/app/controllers/api/v1/accounts/conversations_controller.rb b/app/controllers/api/v1/accounts/conversations_controller.rb
index 2856c7817..2e53fa7c9 100644
--- a/app/controllers/api/v1/accounts/conversations_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations_controller.rb
@@ -140,7 +140,7 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
def destroy
authorize @conversation, :destroy?
- ::DeleteObjectJob.perform_later(@conversation, Current.user, request.ip)
+ ::Conversations::DeleteService.new(conversation: @conversation, user: Current.user, ip: request.ip).perform
head :ok
end
diff --git a/app/services/conversations/delete_service.rb b/app/services/conversations/delete_service.rb
new file mode 100644
index 000000000..6608cfdcd
--- /dev/null
+++ b/app/services/conversations/delete_service.rb
@@ -0,0 +1,16 @@
+class Conversations::DeleteService
+ pattr_initialize [:conversation!, :user, :ip]
+
+ def perform
+ track_deleted_email_messages
+ ::DeleteObjectJob.perform_later(conversation, user, ip)
+ end
+
+ private
+
+ def track_deleted_email_messages
+ return unless conversation.inbox.email?
+
+ Imap::DeletedMessageTracker.new(inbox: conversation.inbox).record(conversation.messages.incoming.pluck(:source_id))
+ end
+end
diff --git a/app/services/imap/base_fetch_email_service.rb b/app/services/imap/base_fetch_email_service.rb
index 24dd22589..e55355f3a 100644
--- a/app/services/imap/base_fetch_email_service.rb
+++ b/app/services/imap/base_fetch_email_service.rb
@@ -38,7 +38,11 @@ class Imap::BaseFetchEmailService
end
def email_already_present?(channel, message_id)
- channel.inbox.messages.find_by(source_id: message_id).present?
+ channel.inbox.messages.find_by(source_id: message_id).present? || deleted_message_tracker.deleted?(message_id)
+ end
+
+ def deleted_message_tracker
+ @deleted_message_tracker ||= Imap::DeletedMessageTracker.new(inbox: channel.inbox)
end
def fetch_mail_for_channel
diff --git a/app/services/imap/deleted_message_tracker.rb b/app/services/imap/deleted_message_tracker.rb
new file mode 100644
index 000000000..7892f258b
--- /dev/null
+++ b/app/services/imap/deleted_message_tracker.rb
@@ -0,0 +1,28 @@
+require 'digest'
+
+class Imap::DeletedMessageTracker
+ TTL = 2.days.to_i
+
+ pattr_initialize [:inbox!]
+
+ def record(source_ids)
+ return unless inbox.email?
+
+ keys = source_ids.compact_blank.map { |source_id| redis_key(source_id) }
+ return if keys.blank?
+
+ Redis::Alfred.pipelined do |pipeline|
+ keys.each { |key| pipeline.set(key, true, ex: TTL) }
+ end
+ end
+
+ def deleted?(source_id)
+ Redis::Alfred.exists?(redis_key(source_id))
+ end
+
+ private
+
+ def redis_key(source_id)
+ format(Redis::RedisKeys::IMAP_DELETED_MESSAGE, inbox_id: inbox.id, message_id_digest: Digest::SHA256.hexdigest(source_id))
+ end
+end
diff --git a/lib/redis/redis_keys.rb b/lib/redis/redis_keys.rb
index fff60c342..bc7fb551e 100644
--- a/lib/redis/redis_keys.rb
+++ b/lib/redis/redis_keys.rb
@@ -2,6 +2,8 @@ module Redis::RedisKeys
## Inbox Keys
# Array storing the ordered ids for agent round robin assignment
ROUND_ROBIN_AGENTS = 'ROUND_ROBIN_AGENTS:%d'.freeze
+ # Track recently deleted IMAP messages to prevent them from being synced again
+ IMAP_DELETED_MESSAGE = 'IMAP_DELETED_MESSAGE::%d::%s'.freeze
## Conversation keys
# Detect whether to send an email reply to the conversation
diff --git a/spec/services/conversations/delete_service_spec.rb b/spec/services/conversations/delete_service_spec.rb
new file mode 100644
index 000000000..2ff14db49
--- /dev/null
+++ b/spec/services/conversations/delete_service_spec.rb
@@ -0,0 +1,35 @@
+require 'rails_helper'
+
+RSpec.describe Conversations::DeleteService do
+ let(:account) { create(:account) }
+ let(:user) { create(:user, account: account) }
+ let(:ip) { '127.0.0.1' }
+ let(:service) { described_class.new(conversation: conversation, user: user, ip: ip) }
+
+ context 'when deleting an email conversation' do
+ let(:inbox) { create(:channel_email, :imap_email, account: account).inbox }
+ let(:conversation) { create(:conversation, account: account, inbox: inbox) }
+ let!(:incoming_message) { create(:message, account: account, inbox: inbox, conversation: conversation, source_id: 'incoming@example.com') }
+ let(:deleted_message_tracker) { instance_double(Imap::DeletedMessageTracker, record: true) }
+
+ before do
+ allow(Imap::DeletedMessageTracker).to receive(:new).with(inbox: inbox).and_return(deleted_message_tracker)
+ end
+
+ it 'records incoming message source ids and enqueues the deletion job' do
+ expect { service.perform }.to have_enqueued_job(DeleteObjectJob).with(conversation, user, ip)
+
+ expect(deleted_message_tracker).to have_received(:record).with([incoming_message.source_id])
+ end
+ end
+
+ context 'when deleting a non-email conversation' do
+ let(:conversation) { create(:conversation, account: account) }
+
+ it 'enqueues the deletion job without recording message source ids' do
+ expect(Imap::DeletedMessageTracker).not_to receive(:new)
+
+ expect { service.perform }.to have_enqueued_job(DeleteObjectJob).with(conversation, user, ip)
+ end
+ end
+end
diff --git a/spec/services/imap/fetch_email_service_spec.rb b/spec/services/imap/fetch_email_service_spec.rb
index 1f74cf0b7..b88e548d9 100644
--- a/spec/services/imap/fetch_email_service_spec.rb
+++ b/spec/services/imap/fetch_email_service_spec.rb
@@ -119,6 +119,28 @@ RSpec.describe Imap::FetchEmailService do
end
end
+ it 'does not return recently deleted emails' do
+ travel_to '26.10.2020 10:00'.to_datetime do
+ email_object = create_inbound_email_from_fixture('only_text.eml')
+ email_header = Net::IMAP::FetchData.new(1, 'BODY[HEADER]' => eml_content_with_message_id)
+ redis_key = format(Redis::RedisKeys::IMAP_DELETED_MESSAGE,
+ inbox_id: imap_email_channel.inbox.id,
+ message_id_digest: Digest::SHA256.hexdigest(email_object.message_id))
+
+ Imap::DeletedMessageTracker.new(inbox: imap_email_channel.inbox).record([email_object.message_id])
+ allow(imap).to receive(:search).with(%w[SINCE 25-Oct-2020]).and_return([1])
+ allow(imap).to receive(:fetch).with([1], 'BODY.PEEK[HEADER]').and_return([email_header])
+ allow(imap).to receive(:logout)
+
+ result = described_class.new(channel: imap_email_channel).perform
+
+ expect(result).to be_empty
+ expect(imap).not_to have_received(:fetch).with(1, 'RFC822')
+ ensure
+ Redis::Alfred.delete(redis_key) if redis_key
+ end
+ end
+
it 'does not count emails without message ids toward the sync limit' do
travel_to '26.10.2020 10:00'.to_datetime do
email_object = create_inbound_email_from_fixture('only_text.eml')
From ba0ba46c9c1c9ec09ebfc8b67bb1d122bfe3315a Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan
Date: Mon, 15 Jun 2026 17:14:34 +0530
Subject: [PATCH 03/26] fix: skip session tracking and use short-lived token
for impersonation (CW-7169) (#14622)
## Description
SuperAdmin impersonation SSO logins no longer create UserSession rows
visible to the customer. Impersonation tokens use a 2-day lifespan
instead of ~2 months, so they naturally evict first and don't linger in
the user's token list.
Server-side detection via Redis value (`'impersonation'` vs `'normal'`)
without changing the `valid_sso_auth_token?` signature. Backward
compatible with in-flight tokens.
Depends on #14556.
## Type of change
- [x] Bug fix (non-breaking change which fixes an issue)
## How Has This Been Tested?
Specs cover: impersonation login skips UserSession creation,
impersonation token has short lifespan, normal SSO login still creates
UserSession row.
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [x] Any dependent changes have been merged and published in downstream
modules
---
.../devise_overrides/sessions_controller.rb | 19 +++++--
app/models/concerns/sso_authenticatable.rb | 12 +++--
.../sessions_controller_spec.rb | 52 +++++++++++++++++++
3 files changed, 77 insertions(+), 6 deletions(-)
diff --git a/app/controllers/devise_overrides/sessions_controller.rb b/app/controllers/devise_overrides/sessions_controller.rb
index 1ef6d9511..7dae29d13 100644
--- a/app/controllers/devise_overrides/sessions_controller.rb
+++ b/app/controllers/devise_overrides/sessions_controller.rb
@@ -20,7 +20,7 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
end
def render_create_success
- track_user_session
+ track_user_session unless @impersonation
render partial: 'devise/auth', formats: [:json], locals: { resource: @resource }
end
@@ -66,7 +66,10 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
end
def authenticate_resource_with_sso_token
- @token = @resource.create_token
+ # DTA evicts the earliest-expiring token after save when at max_number_of_devices.
+ # The short-lived impersonation token would always be that one, so pre-evict to make room.
+ make_room_for_impersonation_token if @impersonation
+ @token = @resource.create_token(lifespan: @impersonation ? 2.days.to_i : nil)
@resource.save!
sign_in(:user, @resource, store: false, bypass: false)
@@ -74,11 +77,21 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
@resource.invalidate_sso_auth_token(params[:sso_auth_token])
end
+ def make_room_for_impersonation_token
+ return if @resource.tokens.size < DeviseTokenAuth.max_number_of_devices
+
+ oldest_client_id = @resource.tokens.min_by { |_, v| v['expiry'].to_i }&.first
+ @resource.tokens.delete(oldest_client_id) if oldest_client_id
+ end
+
def process_sso_auth_token
return if params[:email].blank?
user = User.from_email(params[:email])
- @resource = user if user&.valid_sso_auth_token?(params[:sso_auth_token])
+ return unless user&.valid_sso_auth_token?(params[:sso_auth_token])
+
+ @resource = user
+ @impersonation = user.sso_auth_token_impersonation?(params[:sso_auth_token])
end
def handle_mfa_required(user)
diff --git a/app/models/concerns/sso_authenticatable.rb b/app/models/concerns/sso_authenticatable.rb
index 98b50f336..633e71ee3 100644
--- a/app/models/concerns/sso_authenticatable.rb
+++ b/app/models/concerns/sso_authenticatable.rb
@@ -1,9 +1,9 @@
module SsoAuthenticatable
extend ActiveSupport::Concern
- def generate_sso_auth_token
+ def generate_sso_auth_token(impersonation: false)
token = SecureRandom.hex(32)
- ::Redis::Alfred.setex(sso_token_key(token), true, 5.minutes)
+ ::Redis::Alfred.setex(sso_token_key(token), impersonation ? 'impersonation' : 'normal', 5.minutes)
token
end
@@ -20,8 +20,14 @@ module SsoAuthenticatable
"#{ENV.fetch('FRONTEND_URL', nil)}/app/login?email=#{encoded_email}&sso_auth_token=#{generate_sso_auth_token}"
end
+ def sso_auth_token_impersonation?(token)
+ ::Redis::Alfred.get(sso_token_key(token)) == 'impersonation'
+ end
+
def generate_sso_link_with_impersonation
- "#{generate_sso_link}&impersonation=true"
+ encoded_email = ERB::Util.url_encode(email)
+ "#{ENV.fetch('FRONTEND_URL',
+ nil)}/app/login?email=#{encoded_email}&sso_auth_token=#{generate_sso_auth_token(impersonation: true)}&impersonation=true"
end
private
diff --git a/spec/controllers/devise_overrides/sessions_controller_spec.rb b/spec/controllers/devise_overrides/sessions_controller_spec.rb
index 7e12011b2..f40af6362 100644
--- a/spec/controllers/devise_overrides/sessions_controller_spec.rb
+++ b/spec/controllers/devise_overrides/sessions_controller_spec.rb
@@ -180,4 +180,56 @@ RSpec.describe DeviseOverrides::SessionsController, type: :controller do
end
end
end
+
+ describe 'impersonation SSO login' do
+ let(:user) { create(:user, password: 'Test@123456') }
+ let(:browser_ua) { 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.2.1 Safari/605.1.15' }
+
+ before { request.env['HTTP_USER_AGENT'] = browser_ua }
+
+ it 'does not create a UserSession row for impersonation login' do
+ sso_token = user.generate_sso_auth_token(impersonation: true)
+
+ expect do
+ post :create, params: { email: user.email, sso_auth_token: sso_token }
+ end.not_to change(user.user_sessions, :count)
+
+ expect(response).to have_http_status(:success)
+ end
+
+ it 'creates a short-lived token for impersonation login' do
+ sso_token = user.generate_sso_auth_token(impersonation: true)
+
+ post :create, params: { email: user.email, sso_auth_token: sso_token }
+
+ expect(response).to have_http_status(:success)
+ token_entry = user.reload.tokens.values.last
+ # 2-day lifespan: expiry should be within ~3 days from now (token creation + lifespan)
+ expect(token_entry['expiry']).to be < (3.days.from_now).to_i
+ end
+
+ it 'creates a normal UserSession row for regular SSO login' do
+ sso_token = user.generate_sso_auth_token
+
+ expect do
+ post :create, params: { email: user.email, sso_auth_token: sso_token }
+ end.to change(user.user_sessions, :count).by(1)
+ end
+
+ it 'preserves the impersonation token when target user is at the device cap' do
+ allow(DeviseTokenAuth).to receive(:max_number_of_devices).and_return(5)
+ 5.times do |i|
+ user.tokens["existing#{i}"] = { 'token' => 'x', 'expiry' => (Time.current + (30 + i).days).to_i }
+ end
+ user.save!
+ sso_token = user.generate_sso_auth_token(impersonation: true)
+
+ post :create, params: { email: user.email, sso_auth_token: sso_token }
+
+ expect(response).to have_http_status(:success)
+ new_client_id = response.headers['client']
+ expect(user.reload.tokens.keys).to include(new_client_id)
+ expect(user.tokens.size).to eq(5)
+ end
+ end
end
From 396631ad7d4c58b61296f999e53bf0c8bdd7c1de Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan
Date: Mon, 15 Jun 2026 17:28:13 +0530
Subject: [PATCH 04/26] feat: enforce concurrent session limit with login
picker (CW-7169) (#14621)
## Description
Cap active sessions at `MAX_USER_SESSIONS` which defaults to existing
value of `25` per user. This ensure existing user login behavior is not
affected for self-hosted installations. Browser users at the cap see a
session picker (409 response) to choose which session to end.
Non-browser clients and partially-tracked users get silent
oldest-session eviction.
Depends on #14556.
## Type of change
- [x] New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
Specs cover: under limit, at limit (browser picker, non-browser
eviction), partial tracking fallback, revoke single/all sessions during
login, session row creation on successful login.
---------
Co-authored-by: Sony Mathew
---
.../devise_overrides/sessions_controller.rb | 90 +++++++++++
.../components/auth/SessionLimitOverlay.vue | 141 ++++++++++++++++
.../helper/AnalyticsHelper/events.js | 1 +
.../dashboard/i18n/locale/en/index.js | 2 +
.../i18n/locale/en/sessionLimit.json | 12 ++
app/javascript/v3/api/auth.js | 9 ++
app/javascript/v3/views/login/Index.vue | 72 ++++++++-
.../sessions_controller_spec.rb | 152 +++++++++++++++++-
8 files changed, 476 insertions(+), 3 deletions(-)
create mode 100644 app/javascript/dashboard/components/auth/SessionLimitOverlay.vue
create mode 100644 app/javascript/dashboard/i18n/locale/en/sessionLimit.json
diff --git a/app/controllers/devise_overrides/sessions_controller.rb b/app/controllers/devise_overrides/sessions_controller.rb
index 7dae29d13..587b52c83 100644
--- a/app/controllers/devise_overrides/sessions_controller.rb
+++ b/app/controllers/devise_overrides/sessions_controller.rb
@@ -1,4 +1,6 @@
class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
+ MAX_SESSIONS = ENV.fetch('MAX_USER_SESSIONS', 25).to_i
+
# Prevent session parameter from being passed
# Unpermitted parameter: session
wrap_parameters format: []
@@ -14,6 +16,7 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
user = find_user_for_authentication
return handle_mfa_required(user) if user&.mfa_enabled?
+ return if user && enforce_session_limit_for_password_login(user)
# Only proceed with standard authentication if no MFA is required
super
@@ -54,6 +57,8 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
end
def handle_sso_authentication
+ return if !@impersonation && enforce_session_limit_for_password_login(@resource)
+
authenticate_resource_with_sso_token
yield @resource if block_given?
render_create_success
@@ -117,6 +122,7 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
end
def sign_in_mfa_user(user)
+ evict_oldest_session(user) if sessions_limit_reached?(user)
@resource = user
@token = @resource.create_token
@resource.save!
@@ -129,6 +135,90 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
render json: { error: I18n.t(message_key) }, status: status
end
+ def sessions_limit_reached?(user)
+ active_token_count(user) >= MAX_SESSIONS
+ end
+
+ def active_token_count(user)
+ now = Time.current.to_i
+ (user.tokens || {}).count { |_, v| v['expiry'].to_i > now }
+ end
+
+ # Returns true when a response has been rendered (e.g., 409 picker). Non-browser clients
+ # auto-evict instead of getting stuck on a UI they can't render.
+ def enforce_session_limit_for_password_login(user)
+ if revoking_sessions?
+ revoke_sessions_for_login(user)
+ return false
+ end
+
+ return false unless sessions_limit_reached?(user)
+
+ # Picker only when every token has a tracked session; partial tracking would
+ # show a misleading count, so fall through to silent eviction instead.
+ if browser_request? && user.user_sessions.count >= user.tokens.size
+ handle_sessions_limit_for_login(user)
+ true
+ else
+ evict_oldest_session(user)
+ false
+ end
+ end
+
+ def browser_request?
+ request.user_agent.to_s.include?('Mozilla')
+ end
+
+ def revoking_sessions?
+ params[:revoke_session_id].present? || params[:revoke_all_sessions].present?
+ end
+
+ def revoke_sessions_for_login(user)
+ if params[:revoke_all_sessions].present?
+ user.tokens = {}
+ user.save!
+ user.user_sessions.destroy_all
+ elsif params[:revoke_session_id].present?
+ session = user.user_sessions.find_by(id: params[:revoke_session_id])
+ return unless session
+
+ user.tokens.delete(session.client_id)
+ user.save!
+ session.destroy!
+ end
+ end
+
+ def evict_oldest_session(user)
+ # Drop pre-rollout untracked tokens first so freshly tracked logins aren't evicted.
+ return evict_oldest_token(user) if user.user_sessions.count < user.tokens.size
+
+ oldest_session = user.user_sessions.order(Arel.sql('COALESCE(last_activity_at, created_at) ASC')).first
+ return evict_oldest_token(user) unless oldest_session
+
+ user.tokens.delete(oldest_session.client_id)
+ user.save!
+ oldest_session.destroy!
+ end
+
+ # Fallback if a token exists without a UserSession row (e.g., legacy data before tracking shipped).
+ def evict_oldest_token(user)
+ return if user.tokens.blank?
+
+ oldest_client_id = user.tokens.min_by { |_, v| v['expiry'].to_i }&.first
+ return unless oldest_client_id
+
+ user.tokens.delete(oldest_client_id)
+ user.save!
+ end
+
+ PICKER_SESSION_FIELDS = %i[id browser_name browser_version device_name platform_name platform_version
+ ip_address city country last_activity_at created_at].freeze
+
+ def handle_sessions_limit_for_login(user)
+ sessions = user.user_sessions.order(last_activity_at: :desc).map { |s| s.slice(*PICKER_SESSION_FIELDS) }
+ render json: { sessions_limit_reached: true, sessions: sessions }, status: :conflict
+ end
+
def track_user_session
client_id = @token&.try(:client) || response.headers['client']
return unless client_id.present? && @resource.present?
diff --git a/app/javascript/dashboard/components/auth/SessionLimitOverlay.vue b/app/javascript/dashboard/components/auth/SessionLimitOverlay.vue
new file mode 100644
index 000000000..a3eed7184
--- /dev/null
+++ b/app/javascript/dashboard/components/auth/SessionLimitOverlay.vue
@@ -0,0 +1,141 @@
+
+
+
+
+
+
+
+
+
+ {{ $t('SESSION_LIMIT.TITLE') }}
+
+
+ {{ $t('SESSION_LIMIT.DESCRIPTION') }}
+
+
+
+
+
-
+
{ 'token' => 'x', 'expiry' => (Time.current + expiry_offset_days.days).to_i }
+ )
+ user.save!
+ user.user_sessions.create!(client_id: client_id, last_activity_at: Time.current) if with_session
+ end
+
+ def login_params
+ { email: user.email, password: 'Test@123456' }
+ end
+
+ context 'when under the limit' do
+ it 'allows login without intervention' do
+ request.env['HTTP_USER_AGENT'] = browser_ua
+ 3.times { |i| seed_token("c#{i}", expiry_offset_days: 30) }
+
+ post :create, params: login_params
+
+ expect(response).to have_http_status(:success)
+ end
+
+ it 'does not count expired tokens toward the cap' do
+ request.env['HTTP_USER_AGENT'] = browser_ua
+ # 3 expired + 2 active = 5 raw entries, but only 2 active
+ 3.times { |i| seed_token("expired#{i}", expiry_offset_days: -1, with_session: false) }
+ 2.times { |i| seed_token("active#{i}", expiry_offset_days: 30) }
+
+ post :create, params: login_params
+
+ expect(response).to have_http_status(:success)
+ end
+ end
+
+ context 'when at the limit from a browser with full tracking' do
+ before do
+ request.env['HTTP_USER_AGENT'] = browser_ua
+ 5.times { |i| seed_token("c#{i}", expiry_offset_days: 30) }
+ end
+
+ it 'returns 409 with the session list (picker)' do
+ post :create, params: login_params
+
+ expect(response).to have_http_status(:conflict)
+ body = response.parsed_body
+ expect(body['sessions_limit_reached']).to be true
+ expect(body['sessions'].size).to eq(5)
+ end
+
+ it 'does not create a new session row' do
+ expect { post :create, params: login_params }.not_to change(user.user_sessions, :count)
+ end
+ end
+
+ context 'when at the limit from a non-browser client' do
+ before do
+ request.env['HTTP_USER_AGENT'] = mobile_ua
+ 5.times { |i| seed_token("c#{i}", expiry_offset_days: 30 + i, with_session: false) }
+ end
+
+ it 'silently evicts the oldest token and lets login proceed' do
+ post :create, params: login_params
+
+ expect(response).to have_http_status(:success)
+ expect(user.reload.tokens.keys).not_to include('c0')
+ end
+ end
+
+ context 'when at the limit but tracking is partial (legacy tokens present)' do
+ before do
+ request.env['HTTP_USER_AGENT'] = browser_ua
+ # one tracked, four legacy (no user_session rows)
+ seed_token('tracked', expiry_offset_days: 60, with_session: true)
+ 4.times { |i| seed_token("legacy#{i}", expiry_offset_days: 10 + i, with_session: false) }
+ end
+
+ it 'silent-evicts instead of showing a partial picker' do
+ post :create, params: login_params
+
+ expect(response).to have_http_status(:success)
+ end
+
+ it 'drops an untracked token first, keeping the tracked session alive' do
+ post :create, params: login_params
+
+ tokens = user.reload.tokens.keys
+ expect(tokens).to include('tracked')
+ # legacy0 expires soonest -> evict_oldest_token picks it
+ expect(tokens).not_to include('legacy0')
+ end
+ end
+
+ context 'when at the limit with full tracking (no legacy gap)' do
+ before do
+ request.env['HTTP_USER_AGENT'] = mobile_ua
+ # Five tracked sessions, varying activity timestamps
+ 5.times do |i|
+ seed_token("tracked#{i}", expiry_offset_days: 30)
+ user.user_sessions.find_by(client_id: "tracked#{i}").update!(last_activity_at: (5 - i).days.ago)
+ end
+ end
+
+ it 'evicts the oldest tracked session by last_activity_at' do
+ post :create, params: login_params
+
+ expect(response).to have_http_status(:success)
+ # tracked0 had the oldest last_activity_at (5 days ago)
+ expect(user.reload.tokens.keys).not_to include('tracked0')
+ expect(user.user_sessions.exists?(client_id: 'tracked0')).to be false
+ end
+ end
+
+ context 'with revoke_session_id during login' do
+ before do
+ request.env['HTTP_USER_AGENT'] = browser_ua
+ 5.times { |i| seed_token("c#{i}", expiry_offset_days: 30) }
+ end
+
+ it 'revokes the chosen session and proceeds with login' do
+ target = user.user_sessions.find_by(client_id: 'c2')
+
+ post :create, params: login_params.merge(revoke_session_id: target.id)
+
+ expect(response).to have_http_status(:success)
+ expect(user.reload.tokens.keys).not_to include('c2')
+ expect(user.user_sessions.exists?(id: target.id)).to be false
+ end
+ end
+
+ context 'with revoke_all_sessions during login' do
+ before do
+ request.env['HTTP_USER_AGENT'] = browser_ua
+ 5.times { |i| seed_token("c#{i}", expiry_offset_days: 30) }
+ end
+
+ it 'wipes all sessions and tokens, then proceeds with login' do
+ post :create, params: login_params.merge(revoke_all_sessions: true)
+
+ expect(response).to have_http_status(:success)
+ expect(user.reload.tokens.keys).not_to include('c0', 'c1', 'c2', 'c3', 'c4')
+ # the new login adds one fresh token
+ expect(user.tokens.keys.size).to eq(1)
+ end
+ end
context 'with a successful login' do
before { request.env['HTTP_USER_AGENT'] = browser_ua }
it 'creates a UserSession row for the new client_id' do
- expect { post :create, params: { email: user.email, password: 'Test@123456' } }.to change(user.user_sessions, :count).by(1)
+ expect { post :create, params: login_params }.to change(user.user_sessions, :count).by(1)
session = user.user_sessions.last
expect(session.browser_name).to eq('Safari')
From 4816e923b66f7cfe2b881a6762a7f979219c3adb Mon Sep 17 00:00:00 2001
From: Sony Mathew
Date: Mon, 15 Jun 2026 17:58:04 +0530
Subject: [PATCH 05/26] chore: added a new sort by unread option for
conversations (CW-7152) (#14512)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## Description
Added a new option for the sort by option in conversation filters called
unread. This is to filter out unread conversations.
Fixes # CW-7152
## Type of change
Please delete options that are not relevant.
- [ ] Bug fix (non-breaking change which fixes an issue)
- [x] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality not to work as expected)
- [ ] This change requires a documentation update
## How Has This Been Tested?
Tested manually in local.
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [ ] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---
app/finders/conversation_finder.rb | 1 +
.../dashboard/components/ChatList.vue | 16 +++++
.../conversation/ConversationBasicFilter.vue | 4 ++
app/javascript/dashboard/constants/globals.js | 1 +
.../dashboard/i18n/locale/en/chatlist.json | 3 +
app/models/conversation.rb | 23 +++++++
spec/finders/conversation_finder_spec.rb | 61 +++++++++++++++++++
7 files changed, 109 insertions(+)
diff --git a/app/finders/conversation_finder.rb b/app/finders/conversation_finder.rb
index 1c27d8260..74bf903f5 100644
--- a/app/finders/conversation_finder.rb
+++ b/app/finders/conversation_finder.rb
@@ -12,6 +12,7 @@ class ConversationFinder
'waiting_since_asc' => %w[sort_on_waiting_since asc],
'waiting_since_desc' => %w[sort_on_waiting_since desc],
'priority_desc_created_at_asc' => %w[sort_on_priority_created_at desc],
+ 'unread' => %w[sort_on_unread desc],
# To be removed in v3.5.0
'latest' => %w[sort_on_last_activity_at desc],
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index c96716c5d..39fe35f3d 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -308,6 +308,15 @@ function filterByAssigneeTab(conversations) {
return [...conversations];
}
+function sortByUnreadStatus(conversations) {
+ return [...conversations].sort((a, b) => {
+ const unreadCountDiff = (b.unread_count || 0) - (a.unread_count || 0);
+ if (unreadCountDiff !== 0) return unreadCountDiff;
+
+ return (b.last_activity_at || 0) - (a.last_activity_at || 0);
+ });
+}
+
const conversationList = computed(() => {
let localConversationList = [];
@@ -337,6 +346,13 @@ const conversationList = computed(() => {
});
}
+ if (
+ !hasAppliedFiltersOrActiveFolders.value &&
+ activeSortBy.value === wootConstants.SORT_BY_TYPE.UNREAD
+ ) {
+ localConversationList = sortByUnreadStatus(localConversationList);
+ }
+
return localConversationList;
});
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
index fa1563ed8..38e85b485 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
@@ -78,6 +78,10 @@ const chatSortOptions = computed(() => [
label: t('CHAT_LIST.SORT_ORDER_ITEMS.created_at_asc.TEXT'),
value: 'created_at_asc',
},
+ {
+ label: t('CHAT_LIST.SORT_ORDER_ITEMS.unread.TEXT'),
+ value: 'unread',
+ },
{
label: t('CHAT_LIST.SORT_ORDER_ITEMS.priority_desc.TEXT'),
value: 'priority_desc',
diff --git a/app/javascript/dashboard/constants/globals.js b/app/javascript/dashboard/constants/globals.js
index 889ece96a..24c0f07b1 100644
--- a/app/javascript/dashboard/constants/globals.js
+++ b/app/javascript/dashboard/constants/globals.js
@@ -27,6 +27,7 @@ export default {
WAITING_SINCE_ASC: 'waiting_since_asc',
WAITING_SINCE_DESC: 'waiting_since_desc',
PRIORITY_DESC_CREATED_AT_ASC: 'priority_desc_created_at_asc',
+ UNREAD: 'unread',
},
ARTICLE_STATUS_TYPES: {
DRAFT: 0,
diff --git a/app/javascript/dashboard/i18n/locale/en/chatlist.json b/app/javascript/dashboard/i18n/locale/en/chatlist.json
index 1384dae2b..45755892d 100644
--- a/app/javascript/dashboard/i18n/locale/en/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/en/chatlist.json
@@ -79,6 +79,9 @@
},
"priority_desc_created_at_asc": {
"TEXT": "Priority: Highest first, Created: Oldest first"
+ },
+ "unread": {
+ "TEXT": "Unread Count: Highest first"
}
},
"ATTACHMENTS": {
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 0005ae4a4..d9c06c4d8 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -78,6 +78,9 @@ class Conversation < ApplicationRecord
scope :unassigned, -> { where(assignee_id: nil) }
scope :assigned, -> { where.not(assignee_id: nil) }
scope :assigned_to, ->(agent) { where(assignee_id: agent.id) }
+ scope :sort_on_unread, lambda { |_direction|
+ order(unread_messages_count_arel.desc).sort_on_last_activity_at('desc')
+ }
scope :unattended, -> { where(first_reply_created_at: nil).or(where.not(waiting_since: nil)) }
scope :resolvable_not_waiting, lambda { |auto_resolve_after|
return none if auto_resolve_after.to_i.zero?
@@ -206,6 +209,26 @@ class Conversation < ApplicationRecord
inbox.inbox_type == 'Twitter' && additional_attributes['type'] == 'tweet'
end
+ def self.unread_messages_count_arel
+ messages = Message.arel_table
+ conversations = arel_table
+ unread_messages = messages
+ .project(messages[:id].count)
+ .where(unread_messages_condition(messages, conversations))
+
+ Arel::Nodes::Grouping.new(unread_messages.ast)
+ end
+
+ def self.unread_messages_condition(messages, conversations)
+ messages[:conversation_id].eq(conversations[:id])
+ .and(messages[:account_id].eq(conversations[:account_id]))
+ .and(messages[:message_type].eq(Message.message_types[:incoming]))
+ .and(
+ conversations[:agent_last_seen_at].eq(nil)
+ .or(messages[:created_at].gt(conversations[:agent_last_seen_at]))
+ )
+ end
+
def recent_messages
messages.chat.last(5)
end
diff --git a/spec/finders/conversation_finder_spec.rb b/spec/finders/conversation_finder_spec.rb
index 9427e8157..64f134fe2 100644
--- a/spec/finders/conversation_finder_spec.rb
+++ b/spec/finders/conversation_finder_spec.rb
@@ -96,6 +96,67 @@ describe ConversationFinder do
end
end
+ context 'with unread sort' do
+ let(:params) { { status: 'open', sort_by: 'unread' } }
+
+ it 'returns all conversations matching the selected status with the highest unread count first' do
+ most_unread_conversation = create(:conversation, account: account, inbox: inbox,
+ agent_last_seen_at: 1.hour.ago)
+ unread_conversation = create(:conversation, account: account, inbox: inbox,
+ agent_last_seen_at: 1.hour.ago)
+ read_conversation = create(:conversation, account: account, inbox: inbox,
+ agent_last_seen_at: 1.minute.from_now)
+ resolved_unread_conversation = create(:conversation, account: account, inbox: inbox, status: 'resolved',
+ agent_last_seen_at: 1.hour.ago)
+
+ [most_unread_conversation, unread_conversation, read_conversation, resolved_unread_conversation].each do |conversation|
+ create(:message, account: account, inbox: inbox, conversation: conversation,
+ message_type: :incoming, created_at: 5.minutes.ago)
+ end
+ create(:message, account: account, inbox: inbox, conversation: most_unread_conversation,
+ message_type: :incoming, created_at: 4.minutes.ago)
+ resolved_unread_conversation.update!(status: 'resolved')
+ read_conversation.update!(last_activity_at: 1.minute.from_now)
+ unread_conversation.update!(last_activity_at: 2.minutes.from_now)
+
+ result = conversation_finder.perform
+ conversation_ids = result[:conversations].map(&:id)
+
+ expect(conversation_ids).to include(most_unread_conversation.id, unread_conversation.id, read_conversation.id)
+ expect(conversation_ids).not_to include(resolved_unread_conversation.id)
+ expect(conversation_ids.index(most_unread_conversation.id)).to be < conversation_ids.index(unread_conversation.id)
+ expect(conversation_ids.index(unread_conversation.id)).to be < conversation_ids.index(read_conversation.id)
+ end
+
+ it 'includes private incoming messages in unread counts used for ordering' do
+ private_unread_conversation = create(:conversation, account: account, inbox: inbox,
+ agent_last_seen_at: 1.hour.ago)
+ unread_conversation = create(:conversation, account: account, inbox: inbox,
+ agent_last_seen_at: 1.hour.ago)
+ read_conversation = create(:conversation, account: account, inbox: inbox,
+ agent_last_seen_at: 1.minute.from_now)
+
+ 2.times do
+ create(:message, account: account, inbox: inbox, conversation: private_unread_conversation,
+ message_type: :incoming, private: true, created_at: 5.minutes.ago)
+ end
+ create(:message, account: account, inbox: inbox, conversation: unread_conversation,
+ message_type: :incoming, created_at: 5.minutes.ago)
+ create(:message, account: account, inbox: inbox, conversation: read_conversation,
+ message_type: :incoming, created_at: 5.minutes.ago)
+ private_unread_conversation.update!(last_activity_at: 10.minutes.ago)
+ unread_conversation.update!(last_activity_at: 2.minutes.from_now)
+ read_conversation.update!(last_activity_at: 1.minute.from_now)
+
+ result = conversation_finder.perform
+ conversation_ids = result[:conversations].map(&:id)
+
+ expect(private_unread_conversation.unread_incoming_messages.count).to eq 2
+ expect(conversation_ids.index(private_unread_conversation.id)).to be < conversation_ids.index(unread_conversation.id)
+ expect(conversation_ids.index(unread_conversation.id)).to be < conversation_ids.index(read_conversation.id)
+ end
+ end
+
context 'with assignee_type assigned' do
let(:params) { { assignee_type: 'assigned' } }
From d8a16278b988d086c825e98de945a9145d532180 Mon Sep 17 00:00:00 2001
From: Sony Mathew
Date: Mon, 15 Jun 2026 21:34:19 +0530
Subject: [PATCH 06/26] fix: added ordering capability for sidebar sections
folders, teams, channels and labels (CW-7193) (#14609)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## Description
* Added the ability to sort for 4 sub-sections under conversations
folders, teams, channels and labels.
* the sort options are basically created at, alphabetical and unread
counts along with both directions.
* for folders we don't have an unread count, so we sort it by only
created and alphabetical.
* all the sort preferences are stored on the frontend - easiest
implementation for now.
Fixes # CW-7193
## Type of change
Please delete options that are not relevant.
- [ ] Bug fix (non-breaking change which fixes an issue)
- [x] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality not to work as expected)
- [ ] This change requires a documentation update
## How Has This Been Tested?
Tested this locally by visually verifying the changes. Also ran the
newly added tests for component level changes.
Here is the screenshot of the changes:
Added the sort option to sub sections in the conversation sidebar:
The sort options looks like this:
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [ ] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---------
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: iamsivin
---
.../dropdown-menu/DropdownMenu.vue | 2 +-
.../components-next/sidebar/Sidebar.vue | 95 +++++---
.../sidebar/SidebarCollapsedPopover.vue | 66 ++++--
.../components-next/sidebar/SidebarGroup.vue | 15 +-
.../sidebar/SidebarGroupHeader.vue | 10 +-
.../sidebar/SidebarGroupSeparator.vue | 94 +++++---
.../sidebar/SidebarSortMenu.vue | 209 ++++++++++++++++++
.../sidebar/SidebarSubGroup.vue | 11 +-
.../dashboard/helper/sidebarSort.js | 181 +++++++++++++++
.../helper/specs/sidebarSort.spec.js | 205 +++++++++++++++++
.../dashboard/i18n/locale/en/settings.json | 15 ++
app/javascript/dashboard/store/index.js | 2 +
.../store/modules/sidebarSortPreferences.js | 82 +++++++
.../sidebarSortPreferences/actions.spec.js | 106 +++++++++
.../sidebarSortPreferences/getters.spec.js | 31 +++
.../sidebarSortPreferences/mutations.spec.js | 34 +++
16 files changed, 1071 insertions(+), 87 deletions(-)
create mode 100644 app/javascript/dashboard/components-next/sidebar/SidebarSortMenu.vue
create mode 100644 app/javascript/dashboard/helper/sidebarSort.js
create mode 100644 app/javascript/dashboard/helper/specs/sidebarSort.spec.js
create mode 100644 app/javascript/dashboard/store/modules/sidebarSortPreferences.js
create mode 100644 app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/actions.spec.js
create mode 100644 app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/getters.spec.js
create mode 100644 app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/mutations.spec.js
diff --git a/app/javascript/dashboard/components-next/dropdown-menu/DropdownMenu.vue b/app/javascript/dashboard/components-next/dropdown-menu/DropdownMenu.vue
index 8fa465704..fba446c0d 100644
--- a/app/javascript/dashboard/components-next/dropdown-menu/DropdownMenu.vue
+++ b/app/javascript/dashboard/components-next/dropdown-menu/DropdownMenu.vue
@@ -162,7 +162,7 @@ onMounted(() => {
>
{{ section.title }}
diff --git a/app/javascript/dashboard/components-next/sidebar/Sidebar.vue b/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
index ab037618c..15a007a74 100644
--- a/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
+++ b/app/javascript/dashboard/components-next/sidebar/Sidebar.vue
@@ -21,6 +21,12 @@ import ChannelIcon from 'next/icon/ChannelIcon.vue';
import SidebarAccountSwitcher from './SidebarAccountSwitcher.vue';
import Logo from 'next/icon/Logo.vue';
import ComposeConversation from 'dashboard/components-next/NewConversation/ComposeConversation.vue';
+import {
+ SIDEBAR_SORT_SECTIONS,
+ getSidebarSortOptions,
+ resolveSidebarSort,
+ sortSidebarItems,
+} from 'dashboard/helper/sidebarSort';
const props = defineProps({
isMobileSidebarOpen: {
@@ -50,6 +56,7 @@ const { width: windowWidth } = useWindowSize();
const isMobile = computed(() => windowWidth.value < 768);
const accountId = useMapGetter('getCurrentAccountId');
+const currentUserId = useMapGetter('getCurrentUserID');
const isFeatureEnabledonAccount = useMapGetter(
'accounts/isFeatureEnabledonAccount'
);
@@ -79,6 +86,11 @@ const fetchConversationUnreadCounts = ([currentAccountId, isEnabled]) => {
store.dispatch('conversationUnreadCounts/get');
};
+const fetchSidebarSortPreferences = ([currentAccountId, userId]) => {
+ if (!currentAccountId || !userId) return;
+ store.dispatch('sidebarSortPreferences/initialize');
+};
+
const toggleShortcutModalFn = show => {
if (show) {
emit('openKeyShortcutModal');
@@ -192,6 +204,9 @@ const contactCustomViews = useMapGetter('customViews/getContactCustomViews');
const conversationCustomViews = useMapGetter(
'customViews/getConversationCustomViews'
);
+const getSidebarSectionSort = useMapGetter(
+ 'sidebarSortPreferences/getSectionSort'
+);
onMounted(() => {
store.dispatch('labels/get');
@@ -207,44 +222,62 @@ watch([accountId, hasConversationUnreadCounts], fetchConversationUnreadCounts, {
immediate: true,
});
-const normalizeUnreadCount = count => {
- const unreadCount = Number(count);
- return Number.isFinite(unreadCount) && unreadCount > 0 ? unreadCount : 0;
-};
+watch([accountId, currentUserId], fetchSidebarSortPreferences, {
+ immediate: true,
+});
-const sortByUnreadCount = (items, labelKey, unreadCountKey) =>
- items.slice().sort((a, b) => {
- const unreadCountDiff =
- normalizeUnreadCount(unreadCountKey(b)) -
- normalizeUnreadCount(unreadCountKey(a));
-
- if (unreadCountDiff !== 0) return unreadCountDiff;
-
- return labelKey(a).localeCompare(labelKey(b));
+const getSortOptionsForSection = section =>
+ getSidebarSortOptions(section, {
+ hasUnreadCounts: hasConversationUnreadCounts.value,
});
+const getSortForSection = section =>
+ resolveSidebarSort(section, getSidebarSectionSort.value(section), {
+ hasUnreadCounts: hasConversationUnreadCounts.value,
+ });
+
+const updateSortPreference = (section, sortBy) => {
+ store.dispatch('sidebarSortPreferences/setSectionSort', {
+ section,
+ sortBy,
+ });
+};
+
+const buildSortConfig = section => ({
+ sortOptions: getSortOptionsForSection(section),
+ activeSort: getSortForSection(section),
+ onSortChange: sortBy => updateSortPreference(section, sortBy),
+});
+
+const sortedFolders = computed(() =>
+ sortSidebarItems(conversationCustomViews.value, {
+ sortBy: getSortForSection(SIDEBAR_SORT_SECTIONS.FOLDERS),
+ labelKey: view => view.name,
+ })
+);
+
const sortedTeams = computed(() =>
- sortByUnreadCount(
- teams.value,
- team => team.name,
- team => getTeamUnreadCount.value(team.id)
- )
+ sortSidebarItems(teams.value, {
+ sortBy: getSortForSection(SIDEBAR_SORT_SECTIONS.TEAMS),
+ labelKey: team => team.name,
+ unreadCountKey: team => getTeamUnreadCount.value(team.id),
+ })
);
const sortedInboxes = computed(() =>
- sortByUnreadCount(
- inboxes.value,
- inbox => inbox.name,
- inbox => getInboxUnreadCount.value(inbox.id)
- )
+ sortSidebarItems(inboxes.value, {
+ sortBy: getSortForSection(SIDEBAR_SORT_SECTIONS.CHANNELS),
+ labelKey: inbox => inbox.name,
+ unreadCountKey: inbox => getInboxUnreadCount.value(inbox.id),
+ })
);
const sortedLabels = computed(() =>
- sortByUnreadCount(
- labels.value,
- label => label.title,
- label => getLabelUnreadCount.value(label.id)
- )
+ sortSidebarItems(labels.value, {
+ sortBy: getSortForSection(SIDEBAR_SORT_SECTIONS.LABELS),
+ labelKey: label => label.title,
+ unreadCountKey: label => getLabelUnreadCount.value(label.id),
+ })
);
const closeMobileSidebar = () => {
@@ -331,9 +364,10 @@ const menuItems = computed(() => {
label: t('SIDEBAR.CUSTOM_VIEWS_FOLDER'),
icon: 'i-lucide-folder',
activeOn: ['conversations_through_folders'],
+ ...buildSortConfig(SIDEBAR_SORT_SECTIONS.FOLDERS),
collapsible: true,
showTreeLine: true,
- children: conversationCustomViews.value.map(view => ({
+ children: sortedFolders.value.map(view => ({
name: `${view.name}-${view.id}`,
label: view.name,
to: accountScopedRoute('folder_conversations', { id: view.id }),
@@ -344,6 +378,7 @@ const menuItems = computed(() => {
label: t('SIDEBAR.TEAMS'),
icon: 'i-lucide-users',
activeOn: ['conversations_through_team'],
+ ...buildSortConfig(SIDEBAR_SORT_SECTIONS.TEAMS),
collapsible: true,
showTreeLine: true,
children: sortedTeams.value.map(team => ({
@@ -358,6 +393,7 @@ const menuItems = computed(() => {
label: t('SIDEBAR.CHANNELS'),
icon: 'i-lucide-mailbox',
activeOn: ['conversation_through_inbox'],
+ ...buildSortConfig(SIDEBAR_SORT_SECTIONS.CHANNELS),
collapsible: true,
showTreeLine: true,
children: sortedInboxes.value.map(inbox => ({
@@ -380,6 +416,7 @@ const menuItems = computed(() => {
label: t('SIDEBAR.LABELS'),
icon: 'i-lucide-tag',
activeOn: ['conversations_through_label'],
+ ...buildSortConfig(SIDEBAR_SORT_SECTIONS.LABELS),
collapsible: true,
showTreeLine: true,
children: sortedLabels.value.map(label => ({
diff --git a/app/javascript/dashboard/components-next/sidebar/SidebarCollapsedPopover.vue b/app/javascript/dashboard/components-next/sidebar/SidebarCollapsedPopover.vue
index 18e1aea23..2e431eb7e 100644
--- a/app/javascript/dashboard/components-next/sidebar/SidebarCollapsedPopover.vue
+++ b/app/javascript/dashboard/components-next/sidebar/SidebarCollapsedPopover.vue
@@ -1,11 +1,13 @@
-
-
-
+
+
+
+
+
{
+ return SIDEBAR_SORT_OPTIONS_BY_SECTION[section]?.includes(sortBy);
+};
+
+const isUnreadCountSort = sortBy => UNREAD_COUNT_SORT_OPTIONS.includes(sortBy);
+
+export const getSidebarSortOptions = (
+ section,
+ { hasUnreadCounts = true } = {}
+) => {
+ const options = SIDEBAR_SORT_OPTIONS_BY_SECTION[section] || [];
+
+ if (hasUnreadCounts) return options;
+
+ return options.filter(option => !isUnreadCountSort(option));
+};
+
+export const resolveSidebarSort = (
+ section,
+ sortBy,
+ { hasUnreadCounts = true } = {}
+) => {
+ const options = getSidebarSortOptions(section, { hasUnreadCounts });
+
+ if (options.includes(sortBy)) return sortBy;
+ if (!hasUnreadCounts && isUnreadCountSort(sortBy)) {
+ return SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC;
+ }
+
+ return options[0] || SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC;
+};
+
+export const normalizeSidebarSortPreferences = (preferences = {}) => {
+ const savedPreferences = preferences || {};
+
+ return Object.keys(DEFAULT_SIDEBAR_SORT_PREFERENCES).reduce(
+ (result, section) => {
+ const sortBy = savedPreferences[section];
+ result[section] = isValidSidebarSort(section, sortBy)
+ ? sortBy
+ : DEFAULT_SIDEBAR_SORT_PREFERENCES[section];
+ return result;
+ },
+ {}
+ );
+};
+
+const normalizeUnreadCount = count => {
+ const unreadCount = Number(count);
+ return Number.isFinite(unreadCount) && unreadCount > 0 ? unreadCount : 0;
+};
+
+const getCreatedValue = item => {
+ const createdAt = item.created_at || item.createdAt;
+
+ if (typeof createdAt === 'number') return createdAt;
+
+ if (createdAt) {
+ const timestamp = Date.parse(createdAt);
+ if (Number.isFinite(timestamp)) return timestamp;
+ }
+
+ const id = Number(item.id);
+ return Number.isFinite(id) ? id : 0;
+};
+
+const getLabelValue = (item, labelKey) => {
+ return String(labelKey(item) || '');
+};
+
+const compareAlphabetically = (a, b, labelKey) => {
+ return getLabelValue(a, labelKey).localeCompare(
+ getLabelValue(b, labelKey),
+ undefined,
+ {
+ sensitivity: 'base',
+ }
+ );
+};
+
+export const sortSidebarItems = (
+ items,
+ { sortBy, labelKey, unreadCountKey = () => 0 }
+) => {
+ return (items || []).slice().sort((a, b) => {
+ if (sortBy === SIDEBAR_SORT_KEYS.CREATED_DESC) {
+ const createdDiff = getCreatedValue(b) - getCreatedValue(a);
+ if (createdDiff !== 0) return createdDiff;
+ return compareAlphabetically(a, b, labelKey);
+ }
+
+ if (sortBy === SIDEBAR_SORT_KEYS.CREATED_ASC) {
+ const createdDiff = getCreatedValue(a) - getCreatedValue(b);
+ if (createdDiff !== 0) return createdDiff;
+ return compareAlphabetically(a, b, labelKey);
+ }
+
+ if (sortBy === SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC) {
+ return compareAlphabetically(b, a, labelKey);
+ }
+
+ if (sortBy === SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC) {
+ const unreadCountDiff =
+ normalizeUnreadCount(unreadCountKey(b)) -
+ normalizeUnreadCount(unreadCountKey(a));
+
+ if (unreadCountDiff !== 0) return unreadCountDiff;
+ }
+
+ if (sortBy === SIDEBAR_SORT_KEYS.UNREAD_COUNT_ASC) {
+ const unreadCountDiff =
+ normalizeUnreadCount(unreadCountKey(a)) -
+ normalizeUnreadCount(unreadCountKey(b));
+
+ if (unreadCountDiff !== 0) return unreadCountDiff;
+ }
+
+ return compareAlphabetically(a, b, labelKey);
+ });
+};
diff --git a/app/javascript/dashboard/helper/specs/sidebarSort.spec.js b/app/javascript/dashboard/helper/specs/sidebarSort.spec.js
new file mode 100644
index 000000000..3919252c2
--- /dev/null
+++ b/app/javascript/dashboard/helper/specs/sidebarSort.spec.js
@@ -0,0 +1,205 @@
+import {
+ DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ SIDEBAR_SORT_KEYS,
+ SIDEBAR_SORT_SECTIONS,
+ getSidebarSortOptions,
+ normalizeSidebarSortPreferences,
+ resolveSidebarSort,
+ sortSidebarItems,
+} from '../sidebarSort';
+
+const items = [
+ {
+ id: 1,
+ name: 'Billing',
+ created_at: '2024-01-01T00:00:00.000Z',
+ },
+ {
+ id: 3,
+ name: 'Accounts',
+ created_at: '2024-03-01T00:00:00.000Z',
+ },
+ {
+ id: 2,
+ name: 'Support',
+ created_at: '2024-02-01T00:00:00.000Z',
+ },
+];
+
+describe('#sortSidebarItems', () => {
+ it('sorts by created date descending', () => {
+ const sortedItems = sortSidebarItems(items, {
+ sortBy: SIDEBAR_SORT_KEYS.CREATED_DESC,
+ labelKey: item => item.name,
+ });
+
+ expect(sortedItems.map(item => item.name)).toEqual([
+ 'Accounts',
+ 'Support',
+ 'Billing',
+ ]);
+ });
+
+ it('sorts by created date ascending', () => {
+ const sortedItems = sortSidebarItems(items, {
+ sortBy: SIDEBAR_SORT_KEYS.CREATED_ASC,
+ labelKey: item => item.name,
+ });
+
+ expect(sortedItems.map(item => item.name)).toEqual([
+ 'Billing',
+ 'Support',
+ 'Accounts',
+ ]);
+ });
+
+ it('falls back to id when created date is not present', () => {
+ const sortedItems = sortSidebarItems(
+ items.map(({ created_at: _createdAt, ...item }) => item),
+ {
+ sortBy: SIDEBAR_SORT_KEYS.CREATED_DESC,
+ labelKey: item => item.name,
+ }
+ );
+
+ expect(sortedItems.map(item => item.id)).toEqual([3, 2, 1]);
+ });
+
+ it('sorts alphabetically from A to Z', () => {
+ const sortedItems = sortSidebarItems(items, {
+ sortBy: SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC,
+ labelKey: item => item.name,
+ });
+
+ expect(sortedItems.map(item => item.name)).toEqual([
+ 'Accounts',
+ 'Billing',
+ 'Support',
+ ]);
+ });
+
+ it('sorts alphabetically from Z to A', () => {
+ const sortedItems = sortSidebarItems(items, {
+ sortBy: SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+ labelKey: item => item.name,
+ });
+
+ expect(sortedItems.map(item => item.name)).toEqual([
+ 'Support',
+ 'Billing',
+ 'Accounts',
+ ]);
+ });
+
+ it('sorts by unread count descending and falls back to alphabetical order', () => {
+ const unreadCounts = {
+ 1: 3,
+ 2: 3,
+ 3: 7,
+ };
+
+ const sortedItems = sortSidebarItems(items, {
+ sortBy: SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC,
+ labelKey: item => item.name,
+ unreadCountKey: item => unreadCounts[item.id],
+ });
+
+ expect(sortedItems.map(item => item.name)).toEqual([
+ 'Accounts',
+ 'Billing',
+ 'Support',
+ ]);
+ });
+
+ it('sorts by unread count ascending and falls back to alphabetical order', () => {
+ const unreadCounts = {
+ 1: 3,
+ 2: 3,
+ 3: 7,
+ };
+
+ const sortedItems = sortSidebarItems(items, {
+ sortBy: SIDEBAR_SORT_KEYS.UNREAD_COUNT_ASC,
+ labelKey: item => item.name,
+ unreadCountKey: item => unreadCounts[item.id],
+ });
+
+ expect(sortedItems.map(item => item.name)).toEqual([
+ 'Billing',
+ 'Support',
+ 'Accounts',
+ ]);
+ });
+});
+
+describe('#normalizeSidebarSortPreferences', () => {
+ it('keeps valid preferences', () => {
+ const preferences = normalizeSidebarSortPreferences({
+ [SIDEBAR_SORT_SECTIONS.FOLDERS]: SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+ [SIDEBAR_SORT_SECTIONS.TEAMS]: SIDEBAR_SORT_KEYS.CREATED_ASC,
+ });
+
+ expect(preferences).toEqual({
+ ...DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ [SIDEBAR_SORT_SECTIONS.FOLDERS]: SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+ [SIDEBAR_SORT_SECTIONS.TEAMS]: SIDEBAR_SORT_KEYS.CREATED_ASC,
+ });
+ });
+
+ it('falls back to defaults for unsupported preferences', () => {
+ const preferences = normalizeSidebarSortPreferences({
+ [SIDEBAR_SORT_SECTIONS.FOLDERS]: SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC,
+ });
+
+ expect(preferences).toEqual(DEFAULT_SIDEBAR_SORT_PREFERENCES);
+ });
+
+ it('falls back to defaults when stored preferences are null', () => {
+ expect(normalizeSidebarSortPreferences(null)).toEqual(
+ DEFAULT_SIDEBAR_SORT_PREFERENCES
+ );
+ });
+});
+
+describe('#getSidebarSortOptions', () => {
+ it('keeps unread count options when unread counts are enabled', () => {
+ const options = getSidebarSortOptions(SIDEBAR_SORT_SECTIONS.TEAMS, {
+ hasUnreadCounts: true,
+ });
+
+ expect(options).toContain(SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC);
+ expect(options).toContain(SIDEBAR_SORT_KEYS.UNREAD_COUNT_ASC);
+ });
+
+ it('removes unread count options when unread counts are disabled', () => {
+ const options = getSidebarSortOptions(SIDEBAR_SORT_SECTIONS.TEAMS, {
+ hasUnreadCounts: false,
+ });
+
+ expect(options).not.toContain(SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC);
+ expect(options).not.toContain(SIDEBAR_SORT_KEYS.UNREAD_COUNT_ASC);
+ expect(options).toContain(SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC);
+ });
+});
+
+describe('#resolveSidebarSort', () => {
+ it('keeps unread count sort when unread counts are enabled', () => {
+ const sortBy = resolveSidebarSort(
+ SIDEBAR_SORT_SECTIONS.TEAMS,
+ SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC,
+ { hasUnreadCounts: true }
+ );
+
+ expect(sortBy).toBe(SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC);
+ });
+
+ it('falls back to alphabetical sort when unread counts are disabled', () => {
+ const sortBy = resolveSidebarSort(
+ SIDEBAR_SORT_SECTIONS.TEAMS,
+ SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC,
+ { hasUnreadCounts: false }
+ );
+
+ expect(sortBy).toBe(SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC);
+ });
+});
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index d14175cb5..5e2543698 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -390,6 +390,21 @@
"INFO_TEXT": "Let the system automatically mark you offline when you aren't using the app or dashboard.",
"INFO_SHORT": "Automatically mark offline when you aren't using the app."
},
+ "SORT_TOOLTIP": "Sort",
+ "SORT_BY": "Sort by",
+ "SORT_GROUPS": {
+ "CREATED": "Sort by date of creation",
+ "ALPHABETICAL": "Sort in alphabetical order",
+ "UNREAD_COUNT": "Sort by unread count"
+ },
+ "SORT_OPTIONS": {
+ "CREATED_DESC": "Newest first",
+ "CREATED_ASC": "Oldest first",
+ "ALPHABETICAL_ASC": "Ascending (A - Z)",
+ "ALPHABETICAL_DESC": "Descending (Z - A)",
+ "UNREAD_COUNT_DESC": "Highest first",
+ "UNREAD_COUNT_ASC": "Lowest first"
+ },
"DOCS": "Read docs",
"SECURITY": "Security",
"CAPTAIN_AI": "Captain",
diff --git a/app/javascript/dashboard/store/index.js b/app/javascript/dashboard/store/index.js
index 054a823c6..23685bfad 100755
--- a/app/javascript/dashboard/store/index.js
+++ b/app/javascript/dashboard/store/index.js
@@ -44,6 +44,7 @@ import portals from './modules/helpCenterPortals';
import reports from './modules/reports';
import sla from './modules/sla';
import slaReports from './modules/SLAReports';
+import sidebarSortPreferences from './modules/sidebarSortPreferences';
import summaryReports from './modules/summaryReports';
import teamMembers from './modules/teamMembers';
import teams from './modules/teams';
@@ -108,6 +109,7 @@ export default createStore({
reports,
sla,
slaReports,
+ sidebarSortPreferences,
summaryReports,
teamMembers,
teams,
diff --git a/app/javascript/dashboard/store/modules/sidebarSortPreferences.js b/app/javascript/dashboard/store/modules/sidebarSortPreferences.js
new file mode 100644
index 000000000..2973c80be
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/sidebarSortPreferences.js
@@ -0,0 +1,82 @@
+import { LocalStorage } from 'shared/helpers/localStorage';
+import {
+ DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ isValidSidebarSort,
+ normalizeSidebarSortPreferences,
+} from 'dashboard/helper/sidebarSort';
+
+const STORAGE_NAME = 'chatwoot_sidebar_sort_preferences';
+export const SET_SIDEBAR_SORT_PREFERENCES = 'SET_SIDEBAR_SORT_PREFERENCES';
+
+const getPreferenceScope = rootGetters => {
+ const currentUserId = rootGetters.getCurrentUserID;
+ const currentAccountId = rootGetters.getCurrentAccountId;
+
+ if (!currentUserId || !currentAccountId) return null;
+
+ return `${currentUserId}:${currentAccountId}`;
+};
+
+export const state = {
+ preferences: { ...DEFAULT_SIDEBAR_SORT_PREFERENCES },
+ storageKey: null,
+};
+
+export const getters = {
+ getSectionSort: $state => section => {
+ return (
+ $state.preferences[section] || DEFAULT_SIDEBAR_SORT_PREFERENCES[section]
+ );
+ },
+};
+
+export const actions = {
+ initialize({ commit, rootGetters }) {
+ const storageKey = getPreferenceScope(rootGetters);
+ const storedPreferences = storageKey
+ ? LocalStorage.getFromJsonStore(STORAGE_NAME, storageKey)
+ : {};
+
+ commit(SET_SIDEBAR_SORT_PREFERENCES, {
+ preferences: normalizeSidebarSortPreferences(storedPreferences),
+ storageKey,
+ });
+ },
+ setSectionSort({ commit, rootGetters, state: currentState }, payload = {}) {
+ const { section, sortBy } = payload;
+
+ if (!isValidSidebarSort(section, sortBy)) return;
+
+ const storageKey =
+ currentState.storageKey || getPreferenceScope(rootGetters);
+ const preferences = {
+ ...currentState.preferences,
+ [section]: sortBy,
+ };
+
+ commit(SET_SIDEBAR_SORT_PREFERENCES, {
+ preferences,
+ storageKey,
+ });
+
+ if (storageKey) {
+ LocalStorage.updateJsonStore(STORAGE_NAME, storageKey, preferences);
+ }
+ },
+};
+
+export const mutations = {
+ [SET_SIDEBAR_SORT_PREFERENCES]($state, payload = {}) {
+ const { preferences = {}, storageKey = null } = payload;
+ $state.preferences = normalizeSidebarSortPreferences(preferences);
+ $state.storageKey = storageKey;
+ },
+};
+
+export default {
+ namespaced: true,
+ state,
+ getters,
+ actions,
+ mutations,
+};
diff --git a/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/actions.spec.js b/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/actions.spec.js
new file mode 100644
index 000000000..7fee1d018
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/actions.spec.js
@@ -0,0 +1,106 @@
+import { LocalStorage } from 'shared/helpers/localStorage';
+import {
+ DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ SIDEBAR_SORT_KEYS,
+ SIDEBAR_SORT_SECTIONS,
+} from 'dashboard/helper/sidebarSort';
+import {
+ SET_SIDEBAR_SORT_PREFERENCES,
+ actions,
+} from '../../sidebarSortPreferences';
+
+vi.mock('shared/helpers/localStorage', () => ({
+ LocalStorage: {
+ getFromJsonStore: vi.fn(),
+ updateJsonStore: vi.fn(),
+ },
+}));
+
+const rootGetters = {
+ getCurrentUserID: 1,
+ getCurrentAccountId: 2,
+};
+
+describe('#actions', () => {
+ const commit = vi.fn();
+
+ beforeEach(() => {
+ commit.mockClear();
+ LocalStorage.getFromJsonStore.mockReset();
+ LocalStorage.updateJsonStore.mockReset();
+ });
+
+ describe('#initialize', () => {
+ it('loads scoped preferences from local storage', () => {
+ LocalStorage.getFromJsonStore.mockReturnValue({
+ [SIDEBAR_SORT_SECTIONS.FOLDERS]: SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC,
+ });
+
+ actions.initialize({ commit, rootGetters });
+
+ expect(LocalStorage.getFromJsonStore).toHaveBeenCalledWith(
+ 'chatwoot_sidebar_sort_preferences',
+ '1:2'
+ );
+ expect(commit).toHaveBeenCalledWith(SET_SIDEBAR_SORT_PREFERENCES, {
+ preferences: {
+ ...DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ [SIDEBAR_SORT_SECTIONS.FOLDERS]: SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC,
+ },
+ storageKey: '1:2',
+ });
+ });
+ });
+
+ describe('#setSectionSort', () => {
+ it('persists valid preferences to local storage', () => {
+ const state = {
+ preferences: DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ storageKey: '1:2',
+ };
+
+ actions.setSectionSort(
+ { commit, rootGetters, state },
+ {
+ section: SIDEBAR_SORT_SECTIONS.LABELS,
+ sortBy: SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+ }
+ );
+
+ const preferences = {
+ ...DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ [SIDEBAR_SORT_SECTIONS.LABELS]: SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+ };
+
+ expect(commit).toHaveBeenCalledWith(SET_SIDEBAR_SORT_PREFERENCES, {
+ preferences,
+ storageKey: '1:2',
+ });
+ expect(LocalStorage.updateJsonStore).toHaveBeenCalledWith(
+ 'chatwoot_sidebar_sort_preferences',
+ '1:2',
+ preferences
+ );
+ });
+
+ it('ignores invalid preferences', () => {
+ actions.setSectionSort(
+ {
+ commit,
+ rootGetters,
+ state: {
+ preferences: DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ storageKey: '1:2',
+ },
+ },
+ {
+ section: SIDEBAR_SORT_SECTIONS.FOLDERS,
+ sortBy: SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC,
+ }
+ );
+
+ expect(commit).not.toHaveBeenCalled();
+ expect(LocalStorage.updateJsonStore).not.toHaveBeenCalled();
+ });
+ });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/getters.spec.js b/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/getters.spec.js
new file mode 100644
index 000000000..6c43e23bc
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/getters.spec.js
@@ -0,0 +1,31 @@
+import {
+ DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ SIDEBAR_SORT_KEYS,
+ SIDEBAR_SORT_SECTIONS,
+} from 'dashboard/helper/sidebarSort';
+import { getters } from '../../sidebarSortPreferences';
+
+describe('#getters', () => {
+ it('returns section sort preference', () => {
+ const state = {
+ preferences: {
+ ...DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ [SIDEBAR_SORT_SECTIONS.TEAMS]: SIDEBAR_SORT_KEYS.CREATED_ASC,
+ },
+ };
+
+ expect(getters.getSectionSort(state)(SIDEBAR_SORT_SECTIONS.TEAMS)).toBe(
+ SIDEBAR_SORT_KEYS.CREATED_ASC
+ );
+ });
+
+ it('falls back to default section sort preference', () => {
+ const state = {
+ preferences: {},
+ };
+
+ expect(getters.getSectionSort(state)(SIDEBAR_SORT_SECTIONS.LABELS)).toBe(
+ SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC
+ );
+ });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/mutations.spec.js
new file mode 100644
index 000000000..2f19c84bd
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/mutations.spec.js
@@ -0,0 +1,34 @@
+import {
+ DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ SIDEBAR_SORT_KEYS,
+ SIDEBAR_SORT_SECTIONS,
+} from 'dashboard/helper/sidebarSort';
+import {
+ SET_SIDEBAR_SORT_PREFERENCES,
+ mutations,
+} from '../../sidebarSortPreferences';
+
+describe('#mutations', () => {
+ it('sets normalized preferences', () => {
+ const state = {
+ preferences: {},
+ storageKey: null,
+ };
+
+ mutations[SET_SIDEBAR_SORT_PREFERENCES](state, {
+ preferences: {
+ [SIDEBAR_SORT_SECTIONS.FOLDERS]: SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+ [SIDEBAR_SORT_SECTIONS.LABELS]: 'invalid',
+ },
+ storageKey: '1:2',
+ });
+
+ expect(state).toEqual({
+ preferences: {
+ ...DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ [SIDEBAR_SORT_SECTIONS.FOLDERS]: SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+ },
+ storageKey: '1:2',
+ });
+ });
+});
From 1713cabdf2d9b6749eb7b2da9c1263ad7058b3ab Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Tue, 16 Jun 2026 02:10:05 +0530
Subject: [PATCH 07/26] feat: Add emoji & icon picker for Help Center
categories (#14702)
---
.../api/v1/accounts/categories_controller.rb | 2 +-
app/helpers/portal_helper.rb | 12 +
.../HelpCenter/ArticleCard/ArticleCard.vue | 13 +-
.../HelpCenter/CategoryCard/CategoryCard.vue | 19 +-
.../ArticleEditorControls.vue | 26 +-
.../ArticlePage/ArticleHeaderControls.vue | 34 +-
.../Pages/ArticlePage/ArticlesPage.vue | 1 +
.../Pages/CategoryPage/CategoryDialog.vue | 4 +-
.../Pages/CategoryPage/CategoryForm.vue | 57 +-
.../CategoryPage/CategoryHeaderControls.vue | 1 +
.../Pages/CategoryPage/CategoryList.vue | 1 +
.../Pages/CategoryPage/EditCategoryDialog.vue | 4 +-
.../components/ActionButtons.vue | 10 +-
.../components-next/breadcrumb/Breadcrumb.vue | 14 +-
.../dropdown-menu/DropdownMenu.vue | 17 +-
.../emoji-icon-picker/ColorPalette.vue | 27 +
.../emoji-icon-picker/EmojiIcon.vue | 35 +
.../emoji-icon-picker/EmojiIconPicker.vue | 310 +
.../emoji-icon-picker/constants.js | 44 +
.../emoji-icon-picker/helper.js | 90 +
.../emoji-icon-picker/icons.js | 983 +++
.../components-next/tabbar/TabBar.vue | 1 +
.../widgets/conversation/ReplyBox.vue | 13 +-
.../dashboard/i18n/locale/en/emoji.json | 28 +
.../shared/components/emoji/EmojiInput.vue | 255 -
.../shared/components/emoji/emojisGroup.json | 7652 +++--------------
app/javascript/widget/assets/scss/woot.scss | 6 +
.../widget/components/ChatInputWrap.vue | 23 +-
app/javascript/widget/i18n/locale/en.json | 5 +
.../accounts/articles/_article.json.jbuilder | 2 +
.../categories/_category.json.jbuilder | 1 +
.../api/v1/portals/_category-block.html.erb | 2 +-
.../categories/_category-hero.html.erb | 2 +-
.../_article_card.html.erb | 2 +-
.../documentation_layout/_breadcrumb.html.erb | 4 +-
.../_category_card.html.erb | 2 +-
.../documentation_layout/_hero.html.erb | 2 +-
.../documentation_layout/_sidebar.html.erb | 2 +-
.../categories/_header.html.erb | 2 +-
...0610000000_add_icon_color_to_categories.rb | 5 +
db/schema.rb | 1 +
41 files changed, 3015 insertions(+), 6699 deletions(-)
create mode 100644 app/javascript/dashboard/components-next/emoji-icon-picker/ColorPalette.vue
create mode 100644 app/javascript/dashboard/components-next/emoji-icon-picker/EmojiIcon.vue
create mode 100644 app/javascript/dashboard/components-next/emoji-icon-picker/EmojiIconPicker.vue
create mode 100644 app/javascript/dashboard/components-next/emoji-icon-picker/constants.js
create mode 100644 app/javascript/dashboard/components-next/emoji-icon-picker/helper.js
create mode 100644 app/javascript/dashboard/components-next/emoji-icon-picker/icons.js
delete mode 100644 app/javascript/shared/components/emoji/EmojiInput.vue
create mode 100644 db/migrate/20260610000000_add_icon_color_to_categories.rb
diff --git a/app/controllers/api/v1/accounts/categories_controller.rb b/app/controllers/api/v1/accounts/categories_controller.rb
index 686ffaeec..655b3c890 100644
--- a/app/controllers/api/v1/accounts/categories_controller.rb
+++ b/app/controllers/api/v1/accounts/categories_controller.rb
@@ -53,7 +53,7 @@ class Api::V1::Accounts::CategoriesController < Api::V1::Accounts::BaseControlle
def category_params
params.require(:category).permit(
- :name, :description, :position, :slug, :locale, :icon, :parent_category_id, :associated_category_id
+ :name, :description, :position, :slug, :locale, :icon, :icon_color, :parent_category_id, :associated_category_id
)
end
diff --git a/app/helpers/portal_helper.rb b/app/helpers/portal_helper.rb
index 0c993ec59..31bfe8632 100644
--- a/app/helpers/portal_helper.rb
+++ b/app/helpers/portal_helper.rb
@@ -97,6 +97,18 @@ module PortalHelper
ChatwootMarkdownRenderer.new(content).render_markdown_to_plain_text
end
+ # Renders a stored category icon: a bare ri icon name (e.g. `vip-crown-2-fill/line`) saved color, or a plain emoji character.
+ def render_emoji_or_icon(value, color = nil)
+ return '' if value.blank?
+
+ # Emojis are non-ascii; bare icon names match this safe charset.
+ return ERB::Util.html_escape(value) unless value.match?(/\A[a-z][a-z0-9-]*\z/)
+
+ icon_class = value.start_with?('i-') ? value : "i-ri-#{value}"
+ style = "color: #{color};" if color.to_s.match?(/\A#\h{3,8}\z/)
+ tag.span(class: icon_class, style: style, 'aria-hidden': true)
+ end
+
def thumbnail_bg_color(username)
colors = ['#6D95BA', '#A4C3C3', '#E19191']
return colors.sample if username.blank?
diff --git a/app/javascript/dashboard/components-next/HelpCenter/ArticleCard/ArticleCard.vue b/app/javascript/dashboard/components-next/HelpCenter/ArticleCard/ArticleCard.vue
index 93ff15251..9b1c48a90 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/ArticleCard/ArticleCard.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/ArticleCard/ArticleCard.vue
@@ -13,6 +13,7 @@ import { useMapGetter } from 'dashboard/composables/store.js';
import { useConfig } from 'dashboard/composables/useConfig';
import { FEATURE_FLAGS } from 'dashboard/featureFlags';
import Icon from 'dashboard/components-next/icon/Icon.vue';
+import EmojiIcon from 'dashboard/components-next/emoji-icon-picker/EmojiIcon.vue';
import CardLayout from 'dashboard/components-next/CardLayout.vue';
import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
import Button from 'dashboard/components-next/button/Button.vue';
@@ -131,7 +132,7 @@ const statusText = computed(() => {
const categoryName = computed(() => {
if (props.category?.slug) {
- return `${props.category.icon} ${props.category.name}`;
+ return props.category.name;
}
return t(
'HELP_CENTER.ARTICLES_PAGE.ARTICLE_CARD.CARD.CATEGORY.UNCATEGORISED'
@@ -222,7 +223,15 @@ const handleClick = id => {
{{ authorName || '-' }}
-
+
+
{
return tabs.value.findIndex(tab => tab.value === tabParam);
});
-const activeCategoryName = computed(() => {
- const activeCategory = props.categories.find(
- category => category.slug === route.params.categorySlug
- );
+const activeCategory = computed(() =>
+ props.categories.find(category => category.slug === route.params.categorySlug)
+);
- if (activeCategory) {
- const { icon, name } = activeCategory;
- return `${icon} ${name}`;
- }
-
- return t('HELP_CENTER.ARTICLES_PAGE.ARTICLES_HEADER.CATEGORY.ALL');
-});
+const activeCategoryName = computed(
+ () =>
+ activeCategory.value?.name ||
+ t('HELP_CENTER.ARTICLES_PAGE.ARTICLES_HEADER.CATEGORY.ALL')
+);
const activeLocaleName = computed(() => {
return props.allowedLocales.find(
@@ -94,6 +92,7 @@ const categoryMenuItems = computed(() => {
value: category.slug,
action: 'filter',
emoji: category.icon,
+ iconColor: category.icon_color,
}));
const hasCategorySlug = !!route.params.categorySlug;
@@ -167,14 +166,23 @@ const handleTabChange = value => {
+ >
+
+
value: category.id,
action: 'move',
emoji: category.icon,
+ iconColor: category.icon_color,
}))
);
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryDialog.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryDialog.vue
index d71c17260..efb6be73f 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryDialog.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryDialog.vue
@@ -38,8 +38,8 @@ const { t } = useI18n();
const route = useRoute();
const handleCategory = async formData => {
- const { id, name, slug, icon, description, locale } = formData;
- const categoryData = { name, icon, slug, description };
+ const { id, name, slug, icon, iconColor, description, locale } = formData;
+ const categoryData = { name, icon, icon_color: iconColor, slug, description };
if (props.mode === 'create') {
categoryData.locale = locale;
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryForm.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryForm.vue
index d2bf42ef5..a1d5624c9 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryForm.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryForm.vue
@@ -18,6 +18,7 @@ import { convertToCategorySlug } from 'dashboard/helper/commons.js';
import Input from 'dashboard/components-next/input/Input.vue';
import TextArea from 'dashboard/components-next/textarea/TextArea.vue';
import Button from 'dashboard/components-next/button/Button.vue';
+import EmojiIcon from 'dashboard/components-next/emoji-icon-picker/EmojiIcon.vue';
const props = defineProps({
mode: {
@@ -49,8 +50,9 @@ const props = defineProps({
const emit = defineEmits(['submit', 'cancel']);
-const EmojiInput = defineAsyncComponent(
- () => import('shared/components/emoji/EmojiInput.vue')
+const EmojiIconPicker = defineAsyncComponent(
+ () =>
+ import('dashboard/components-next/emoji-icon-picker/EmojiIconPicker.vue')
);
const { t } = useI18n();
@@ -72,6 +74,7 @@ const state = reactive({
id: '',
name: '',
icon: '',
+ iconColor: '',
slug: '',
description: '',
locale: '',
@@ -109,8 +112,19 @@ const slugHelpText = computed(() => {
});
});
-const onClickInsertEmoji = emoji => {
- state.icon = emoji;
+const onSelectIcon = ({ type, value, color }) => {
+ state.icon = value;
+ state.iconColor = type === 'icon' ? color : '';
+ isEmojiPickerOpen.value = false;
+};
+
+const onColorChange = color => {
+ state.iconColor = color;
+};
+
+const onRemoveIcon = () => {
+ state.icon = '';
+ state.iconColor = '';
isEmojiPickerOpen.value = false;
};
@@ -139,7 +153,14 @@ watch(
newCategory => {
if (props.mode === 'edit' && newCategory) {
const { id, name, icon, slug, description } = newCategory;
- Object.assign(state, { id, name, icon, slug, description });
+ Object.assign(state, {
+ id,
+ name,
+ icon,
+ iconColor: newCategory.icon_color || '',
+ slug,
+ description,
+ });
}
},
{ immediate: true }
@@ -197,19 +218,29 @@ defineExpose({ state, isSubmitDisabled });
-
+
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryHeaderControls.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryHeaderControls.vue
index f25ac8027..d134f1168 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryHeaderControls.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryHeaderControls.vue
@@ -106,6 +106,7 @@ const breadcrumbItems = computed(() => {
}
),
emoji: selectedCategoryEmoji.value,
+ iconColor: selectedCategory.value?.icon_color,
});
}
return items;
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryList.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryList.vue
index 0dc0de895..45e783246 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryList.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryList.vue
@@ -68,6 +68,7 @@ watch(
:id="element.id"
:title="element.name"
:icon="element.icon"
+ :icon-color="element.icon_color"
:description="element.description"
:articles-count="element.meta?.articles_count || 0"
:slug="element.slug"
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/EditCategoryDialog.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/EditCategoryDialog.vue
index 5b339e568..2456ce596 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/EditCategoryDialog.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/EditCategoryDialog.vue
@@ -52,8 +52,8 @@ const activeLocaleCode = computed(() => activeLocale.value?.code ?? '');
const onUpdateCategory = async () => {
if (!categoryFormRef.value) return;
const { state } = categoryFormRef.value;
- const { id, name, slug, icon, description } = state;
- const categoryData = { name, icon, slug, description };
+ const { id, name, slug, icon, iconColor, description } = state;
+ const categoryData = { name, icon, icon_color: iconColor, slug, description };
categoryData.id = id;
try {
diff --git a/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue b/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
index 22c142322..e488ee107 100644
--- a/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
+++ b/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
@@ -53,8 +53,9 @@ const generateUid = () => {
const uploadAttachment = ref(null);
const isEmojiPickerOpen = ref(false);
-const EmojiInput = defineAsyncComponent(
- () => import('shared/components/emoji/EmojiInput.vue')
+const EmojiIconPicker = defineAsyncComponent(
+ () =>
+ import('dashboard/components-next/emoji-icon-picker/EmojiIconPicker.vue')
);
const {
@@ -215,10 +216,11 @@ useEventListener(document, 'paste', onPaste);
class="!w-10"
@click="isEmojiPickerOpen = !isEmojiPickerOpen"
/>
-
{
-
- {{ item.emoji ? item.emoji : '' }} {{ item.label }}
+
+
{
class="flex-shrink-0 size-3.5"
/>
- {{ item.emoji }}
+
+import { useI18n } from 'vue-i18n';
+import { ICON_COLORS } from './constants';
+
+const { t } = useI18n();
+const selectedColor = defineModel({ type: String, default: '' });
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/emoji-icon-picker/EmojiIcon.vue b/app/javascript/dashboard/components-next/emoji-icon-picker/EmojiIcon.vue
new file mode 100644
index 000000000..c4ca21be5
--- /dev/null
+++ b/app/javascript/dashboard/components-next/emoji-icon-picker/EmojiIcon.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
-import emojis from './emojisGroup.json';
-import FluentIcon from 'shared/components/FluentIcon/Index.vue';
-import NextButton from 'dashboard/components-next/button/Button.vue';
-const SEARCH_KEY = 'Search';
-
-export default {
- components: { FluentIcon, NextButton },
- props: {
- onClick: {
- type: Function,
- default: () => {},
- },
- showRemoveButton: {
- type: Boolean,
- default: false,
- },
- },
- data() {
- return {
- selectedKey: 'Search',
- emojis,
- search: '',
- };
- },
- computed: {
- categories() {
- return [...this.emojis];
- },
- filterEmojisByCategory() {
- const selectedCategoryName = this.emojis.find(category =>
- category.name === this.selectedKey ? category.name : null
- );
- return selectedCategoryName?.emojis;
- },
- filterAllEmojisBySearch() {
- return this.emojis.map(category => {
- const allEmojis = category.emojis.filter(emoji =>
- emoji.slug.replaceAll('_', ' ').includes(this.search.toLowerCase())
- );
- return allEmojis.length > 0
- ? { ...category, emojis: allEmojis }
- : { ...category, emojis: [] };
- });
- },
- hasNoSearch() {
- return this.selectedKey !== SEARCH_KEY && this.search === '';
- },
- hasEmptySearchResult() {
- return this.filterAllEmojisBySearch.every(
- category => category.emojis.length === 0
- );
- },
- },
- watch: {
- search() {
- this.selectedKey = 'Search';
- },
- selectedKey() {
- return this.selectedKey === 'Search' ? this.focusSearchInput() : null;
- },
- },
- mounted() {
- this.focusSearchInput();
- },
- methods: {
- changeCategory(category) {
- this.search = '';
- this.$refs.emojiItem.scrollTo({ top: 0 });
- this.selectedKey = category;
- },
- getFirstEmojiByCategoryName(categoryName) {
- const categoryItem = this.emojis.find(category =>
- category.name === categoryName ? category : null
- );
- return categoryItem ? categoryItem.emojis[0].emoji : '';
- },
- focusSearchInput() {
- this.$nextTick(() => {
- this.$refs.searchbar.focus();
- });
- },
- },
-};
-
-
-
-
-
-
-
-
- {{ selectedKey }}
-
-
-
-
-
-
-
-
- {{ category.name }}
-
-
-
-
-
-
-
-
- <% if category.icon.present? %><%= render_emoji_or_icon(category.icon, category.icon_color) %><% end %>
+ <% if category.icon.present? %><%= render_emoji_or_icon(category.icon, category.icon_color) %><% end %>
<%= category.name %>
<% end %>
diff --git a/spec/helpers/portal_helper_spec.rb b/spec/helpers/portal_helper_spec.rb
index 37c7a927c..96df64a05 100644
--- a/spec/helpers/portal_helper_spec.rb
+++ b/spec/helpers/portal_helper_spec.rb
@@ -23,35 +23,6 @@ describe PortalHelper do
end
end
- describe '#generate_portal_bg_color' do
- context 'when theme is dark' do
- it 'returns the correct color mix with black' do
- expect(helper.generate_portal_bg_color('#ff0000', 'dark')).to eq(
- 'color-mix(in srgb, #ff0000 20%, black)'
- )
- end
- end
-
- context 'when theme is not dark' do
- it 'returns the correct color mix with white' do
- expect(helper.generate_portal_bg_color('#ff0000', 'light')).to eq(
- 'color-mix(in srgb, #ff0000 20%, white)'
- )
- end
- end
-
- context 'when provided with various colors' do
- it 'adjusts the color mix appropriately' do
- expect(helper.generate_portal_bg_color('#00ff00', 'dark')).to eq(
- 'color-mix(in srgb, #00ff00 20%, black)'
- )
- expect(helper.generate_portal_bg_color('#0000ff', 'light')).to eq(
- 'color-mix(in srgb, #0000ff 20%, white)'
- )
- end
- end
- end
-
describe '#generate_portal_bg' do
context 'when theme is dark' do
it 'returns the correct background with dark grid image and color mix with black' do
From de137e8297c4ed19f405730318dc242fa7c03072 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth
Date: Tue, 16 Jun 2026 09:58:29 +0400
Subject: [PATCH 10/26] feat: Capture CTWA referral metadata for WhatsApp
conversations (#14681)
Adds support for capturing Click-to-WhatsApp ad referral metadata from
incoming WhatsApp messages.
This stores Meta Cloud API `referral` payloads on the incoming message
`content_attributes` and normalizes Twilio `Referral*` callback fields
into the same shape. The UI display is intentionally deferred until
Instagram, Messenger, and TikTok referral payloads are captured as well,
so we can design one cross-channel referral surface instead of a
WhatsApp-only sidebar block.
Why message-level storage
Meta sends CTWA referral details as part of the inbound message payload,
not as a stable conversation-level webhook. The referral represents the
exact ad click that produced that specific customer message, and later
messages in the same conversation may not carry the same context.
Storing the normalized referral on the message preserves the original
webhook semantics, avoids adding conversation-level attribution that
could become stale or ambiguous, and keeps support for both Cloud API
and Twilio payloads aligned behind `content_attributes.referral`.
Fixes
https://linear.app/chatwoot/issue/CW-7090/surface-meta-ctwa-referral-on-incoming-whatsapp-messages-cloud-api
Closes https://github.com/chatwoot/chatwoot/issues/13995,
https://github.com/chatwoot/chatwoot/issues/12560,
https://github.com/chatwoot/chatwoot/issues/13006
Related community PRs
- https://github.com/chatwoot/chatwoot/pull/13130
- https://github.com/chatwoot/chatwoot/pull/14180
- https://github.com/chatwoot/chatwoot/pull/14121
Related follow-ups
-
https://linear.app/chatwoot/issue/CW-7301/capture-instagram-ad-referral-metadata-on-incoming-messages
-
https://linear.app/chatwoot/issue/CW-7302/capture-messenger-ad-referral-metadata-on-facebook-page-conversations
-
https://linear.app/chatwoot/issue/CW-7303/capture-tiktok-ad-referral-metadata-from-im-referral-msg-events
How to test
1. Send or replay a WhatsApp Cloud API inbound message that contains a
`messages[0].referral` payload from a Click-to-WhatsApp ad.
2. Confirm the generated incoming message stores the payload under
`content_attributes.referral`.
3. Repeat with a Twilio WhatsApp callback containing `Referral*` fields
and confirm the stored message has the same normalized
`content_attributes.referral` structure.
---------
Co-authored-by: Muhsin <12408980+muhsin-k@users.noreply.github.com>
---
app/controllers/twilio/callback_controller.rb | 12 ++-
.../twilio/incoming_message_service.rb | 4 +-
app/services/twilio/referral_params_helper.rb | 28 +++++++
.../whatsapp/incoming_message_base_service.rb | 17 ++--
.../incoming_message_service_helpers.rb | 6 ++
.../twilio/callbacks_controller_spec.rb | 10 ++-
.../twilio/incoming_message_service_spec.rb | 54 ++++++++++++
...ing_message_whatsapp_cloud_service_spec.rb | 82 +++++++++++++++++++
8 files changed, 204 insertions(+), 9 deletions(-)
create mode 100644 app/services/twilio/referral_params_helper.rb
diff --git a/app/controllers/twilio/callback_controller.rb b/app/controllers/twilio/callback_controller.rb
index 53075a555..ed1a05376 100644
--- a/app/controllers/twilio/callback_controller.rb
+++ b/app/controllers/twilio/callback_controller.rb
@@ -35,7 +35,17 @@ class Twilio::CallbackController < ApplicationController
:ExternalUserId,
:ParentExternalUserId,
:ProfileUsername,
- :Username
+ :Username,
+ :ReferralBody,
+ :ReferralHeadline,
+ :ReferralSourceId,
+ :ReferralSourceType,
+ :ReferralSourceUrl,
+ :ReferralMediaId,
+ :ReferralMediaContentType,
+ :ReferralMediaUrl,
+ :ReferralNumMedia,
+ :ReferralCtwaClid
)
end
end
diff --git a/app/services/twilio/incoming_message_service.rb b/app/services/twilio/incoming_message_service.rb
index dab55e521..02a1636ed 100644
--- a/app/services/twilio/incoming_message_service.rb
+++ b/app/services/twilio/incoming_message_service.rb
@@ -1,6 +1,7 @@
class Twilio::IncomingMessageService
include ::FileTypeHelper
include ::Twilio::WhatsappIdentifierHelper
+ include ::Twilio::ReferralParamsHelper
pattr_initialize [:params!]
@@ -15,7 +16,8 @@ class Twilio::IncomingMessageService
inbox_id: @inbox.id,
message_type: :incoming,
sender: @contact,
- source_id: params[:SmsSid]
+ source_id: params[:SmsSid],
+ content_attributes: message_content_attributes
)
attach_files
attach_location if location_message?
diff --git a/app/services/twilio/referral_params_helper.rb b/app/services/twilio/referral_params_helper.rb
new file mode 100644
index 000000000..0bc032dbb
--- /dev/null
+++ b/app/services/twilio/referral_params_helper.rb
@@ -0,0 +1,28 @@
+module Twilio::ReferralParamsHelper
+ REFERRAL_PARAM_MAPPING = {
+ source_id: :ReferralSourceId,
+ source_type: :ReferralSourceType,
+ source_url: :ReferralSourceUrl,
+ headline: :ReferralHeadline,
+ body: :ReferralBody,
+ media_id: :ReferralMediaId,
+ media_content_type: :ReferralMediaContentType,
+ media_url: :ReferralMediaUrl,
+ num_media: :ReferralNumMedia,
+ ctwa_clid: :ReferralCtwaClid
+ }.freeze
+
+ def message_content_attributes
+ referral_attributes.present? ? { referral: referral_attributes } : {}
+ end
+
+ def referral_attributes
+ return {} unless twilio_channel.whatsapp?
+ return {} if params[:ReferralSourceId].blank?
+
+ REFERRAL_PARAM_MAPPING.each_with_object({}) do |(attribute, param_key), result|
+ value = params[param_key]
+ result[attribute] = value if value.present?
+ end
+ end
+end
diff --git a/app/services/whatsapp/incoming_message_base_service.rb b/app/services/whatsapp/incoming_message_base_service.rb
index 9e0720f74..00936ff15 100644
--- a/app/services/whatsapp/incoming_message_base_service.rb
+++ b/app/services/whatsapp/incoming_message_base_service.rb
@@ -91,7 +91,7 @@ class Whatsapp::IncomingMessageBaseService
def create_contact_messages(message)
message['contacts'].each do |contact|
# Pass source_id from parent message since contact objects don't have :id
- create_message(contact, source_id: message[:id])
+ create_message(contact, source_id: message[:id], content_attributes_source: message)
attach_contact(contact)
@message.save!
end
@@ -158,10 +158,7 @@ class Whatsapp::IncomingMessageBaseService
)
end
- def create_message(message, source_id: nil)
- content_attrs = outgoing_echo ? { external_echo: true } : {}
- content_attrs[:in_reply_to_external_id] = @in_reply_to_external_id if @in_reply_to_external_id.present?
-
+ def create_message(message, source_id: nil, content_attributes_source: message)
@message = @conversation.messages.build(
content: message_content(message),
account_id: @inbox.account_id,
@@ -171,10 +168,18 @@ class Whatsapp::IncomingMessageBaseService
status: outgoing_echo ? :delivered : :sent,
sender: outgoing_echo ? nil : @contact,
source_id: (source_id || message[:id]).to_s,
- content_attributes: content_attrs
+ content_attributes: message_content_attributes(content_attributes_source)
)
end
+ def message_content_attributes(message)
+ content_attrs = outgoing_echo ? { external_echo: true } : {}
+ content_attrs[:in_reply_to_external_id] = @in_reply_to_external_id if @in_reply_to_external_id.present?
+ referral_content_attrs = referral_attributes(message)
+ content_attrs[:referral] = referral_content_attrs if referral_content_attrs.present?
+ content_attrs
+ end
+
def attach_contact(contact)
phones = contact[:phones]
phones = [{ phone: 'Phone number is not available' }] if phones.blank?
diff --git a/app/services/whatsapp/incoming_message_service_helpers.rb b/app/services/whatsapp/incoming_message_service_helpers.rb
index 27a854479..fd0d44cbe 100644
--- a/app/services/whatsapp/incoming_message_service_helpers.rb
+++ b/app/services/whatsapp/incoming_message_service_helpers.rb
@@ -71,6 +71,12 @@ module Whatsapp::IncomingMessageServiceHelpers
@in_reply_to_external_id = message['context']&.[]('id')
end
+ def referral_attributes(message)
+ return {} if outgoing_echo
+
+ message[:referral]&.to_h&.deep_stringify_keys || {}
+ end
+
def find_message_by_source_id(source_id)
return unless source_id
diff --git a/spec/controllers/twilio/callbacks_controller_spec.rb b/spec/controllers/twilio/callbacks_controller_spec.rb
index 1dc2991ae..3a4ef16c1 100644
--- a/spec/controllers/twilio/callbacks_controller_spec.rb
+++ b/spec/controllers/twilio/callbacks_controller_spec.rb
@@ -13,7 +13,15 @@ RSpec.describe 'Twilio::CallbacksController', type: :request do
'SmsSid' => 'SM123',
'ExternalUserId' => 'IN.2081978709342942',
'ParentExternalUserId' => 'IN.ENT.9081726354',
- 'ProfileUsername' => 'muhsin'
+ 'ProfileUsername' => 'muhsin',
+ 'ReferralCtwaClid' => 'AfjyUDlaIoiweZDnlzmDTEaG',
+ 'ReferralSourceId' => '120237244350960485',
+ 'ReferralSourceUrl' => 'https://fb.me/4tBfhWhjr',
+ 'ReferralSourceType' => 'ad',
+ 'ReferralHeadline' => 'German citizenship lawyer',
+ 'ReferralBody' => 'Fast-track your German citizenship',
+ 'ReferralMediaId' => '',
+ 'ReferralNumMedia' => '0'
}
end
diff --git a/spec/services/twilio/incoming_message_service_spec.rb b/spec/services/twilio/incoming_message_service_spec.rb
index d50a0113d..dc30f6e62 100644
--- a/spec/services/twilio/incoming_message_service_spec.rb
+++ b/spec/services/twilio/incoming_message_service_spec.rb
@@ -511,6 +511,60 @@ describe Twilio::IncomingMessageService do
end
end
+ describe 'When the incoming WhatsApp message has CTWA referral parameters' do
+ let!(:whatsapp_twilio_channel) do
+ create(:channel_twilio_sms, :whatsapp, account: account, account_sid: 'ACxxx',
+ inbox: create(:inbox, account: account, greeting_enabled: false))
+ end
+
+ it 'stores normalized referral attributes on the message' do
+ params = {
+ SmsSid: 'SMxx',
+ From: 'whatsapp:+491741763110',
+ AccountSid: 'ACxxx',
+ MessagingServiceSid: whatsapp_twilio_channel.messaging_service_sid,
+ Body: 'Hallo! Kann ich hierzu mehr Informationen erhalten?',
+ ReferralCtwaClid: 'AfjyUDlaIoiweZDnlzmDTEaG',
+ ReferralSourceId: '120237244350960485',
+ ReferralSourceUrl: 'https://fb.me/4tBfhWhjr',
+ ReferralSourceType: 'ad',
+ ReferralHeadline: 'German citizenship lawyer',
+ ReferralBody: 'Fast-track your German citizenship',
+ ReferralMediaId: '',
+ ReferralNumMedia: '0'
+ }
+
+ described_class.new(params: params).perform
+
+ message = whatsapp_twilio_channel.inbox.messages.last
+ expect(message.content_attributes['referral']).to eq(
+ 'ctwa_clid' => 'AfjyUDlaIoiweZDnlzmDTEaG',
+ 'source_id' => '120237244350960485',
+ 'source_url' => 'https://fb.me/4tBfhWhjr',
+ 'source_type' => 'ad',
+ 'headline' => 'German citizenship lawyer',
+ 'body' => 'Fast-track your German citizenship',
+ 'num_media' => '0'
+ )
+ end
+
+ it 'does not add referral attributes when ReferralSourceId is absent' do
+ params = {
+ SmsSid: 'SMxx',
+ From: 'whatsapp:+491741763110',
+ AccountSid: 'ACxxx',
+ MessagingServiceSid: whatsapp_twilio_channel.messaging_service_sid,
+ Body: 'Regular WhatsApp message',
+ ReferralCtwaClid: 'AfjyUDlaIoiweZDnlzmDTEaG'
+ }
+
+ described_class.new(params: params).perform
+
+ message = whatsapp_twilio_channel.inbox.messages.last
+ expect(message.content_attributes).not_to have_key('referral')
+ end
+ end
+
describe 'When the incoming number is a Brazilian number in new format with 9 included' do
let!(:whatsapp_twilio_channel) do
create(:channel_twilio_sms, :whatsapp, account: account, account_sid: 'ACxxx',
diff --git a/spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb b/spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb
index 1bbd6d8f4..60b153775 100644
--- a/spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb
@@ -234,6 +234,88 @@ describe Whatsapp::IncomingMessageWhatsappCloudService do
end
end
+ context 'when message contains referral data' do
+ let(:referral_params) do
+ {
+ phone_number: whatsapp_channel.phone_number,
+ object: 'whatsapp_business_account',
+ entry: [{
+ changes: [{
+ value: {
+ contacts: [{ profile: { name: 'Mom' }, wa_id: '255718573302', user_id: 'TZ.1040042605869930' }],
+ messages: [{
+ referral: {
+ source_url: 'https://fb.me/3TYpooaRT',
+ source_id: '52558118838064',
+ source_type: 'ad',
+ body: 'washa data tu',
+ headline: 'Diana Digital',
+ media_type: 'video',
+ video_url: 'https://www.facebook.com/reel/1438165771395493/',
+ thumbnail_url: 'https://scontent.xx.fbcdn.net/sample.jpg',
+ ctwa_clid: 'AfhcQdP2E4A8wWpeb1FqUzUi',
+ welcome_message: {
+ text: 'Hi! Please let us know how we can help you.'
+ }
+ },
+ from: '255718573302',
+ from_user_id: 'TZ.1040042605869930',
+ id: 'wamid.CTWA_REFERRAL_MESSAGE',
+ timestamp: '1780649766',
+ text: { body: 'Hello nielekeze' },
+ type: 'text'
+ }]
+ }
+ }]
+ }]
+ }.with_indifferent_access
+ end
+
+ it 'stores the referral payload in message content attributes' do
+ described_class.new(inbox: whatsapp_channel.inbox, params: referral_params).perform
+
+ message = whatsapp_channel.inbox.messages.last
+ expect(message.content).to eq('Hello nielekeze')
+ expect(message.content_attributes['referral']).to include(
+ 'source_url' => 'https://fb.me/3TYpooaRT',
+ 'source_id' => '52558118838064',
+ 'source_type' => 'ad',
+ 'body' => 'washa data tu',
+ 'headline' => 'Diana Digital',
+ 'media_type' => 'video',
+ 'video_url' => 'https://www.facebook.com/reel/1438165771395493/',
+ 'thumbnail_url' => 'https://scontent.xx.fbcdn.net/sample.jpg',
+ 'ctwa_clid' => 'AfhcQdP2E4A8wWpeb1FqUzUi',
+ 'welcome_message' => { 'text' => 'Hi! Please let us know how we can help you.' }
+ )
+ end
+
+ it 'preserves the referral payload when the message contains contacts' do
+ contacts_referral_params = referral_params.deep_dup
+ parent_message = contacts_referral_params.dig(:entry, 0, :changes, 0, :value, :messages, 0)
+ parent_message[:type] = 'contacts'
+ parent_message.delete(:text)
+ parent_message[:contacts] = [{
+ name: {
+ formatted_name: 'Diana Digital',
+ first_name: 'Diana',
+ last_name: 'Digital'
+ },
+ phones: [{ phone: '+255718573302' }]
+ }]
+
+ described_class.new(inbox: whatsapp_channel.inbox, params: contacts_referral_params).perform
+
+ message = whatsapp_channel.inbox.messages.last
+ expect(message.content).to eq('Diana Digital')
+ expect(message.content_attributes['referral']).to include(
+ 'source_id' => '52558118838064',
+ 'headline' => 'Diana Digital',
+ 'ctwa_clid' => 'AfhcQdP2E4A8wWpeb1FqUzUi'
+ )
+ end
+ end
+
context 'when message is a reply (has context)' do
let(:reply_params) do
{
From 41a3ab6dfa39a0af06e110aeef0ba84628fe64de Mon Sep 17 00:00:00 2001
From: Sojan Jose
Date: Tue, 16 Jun 2026 15:29:27 +0530
Subject: [PATCH 11/26] feat(companies): add contact company selector (#14496)
Adds a company selector to the contact details form so agents can
associate a contact with an existing company directly from the contact
page.
Closes
- None
Why
Contacts already expose company information through the CRM fields, but
the form only accepted free-text company names. As we split company CRM
work into smaller PRs, this keeps the contact page aligned with the
structured company model while preserving the existing company-name
behavior used by automations.
What changed
- Shows a company dropdown in the contact details form when the
Companies feature is enabled.
- Keeps legacy free-text company names editable when a contact has no
structured `company_id`.
- Allows Enterprise contact create/update APIs to accept account-scoped
`company_id`.
- Syncs `additional_attributes.company_name` when a contact is
associated with a company, including the existing email-domain
auto-association path.
- Serializes `company_id` in the contact model payload so the form can
show the current association.
How to test
1. Enable Companies for an account and open a contact details page.
2. In Edit contact details, use the Company field to select an existing
company.
3. Save the contact and refresh the page.
4. Confirm the selected company remains visible and the contact is
associated with that company.
5. Confirm contacts with only a legacy free-text company name still show
the text input instead of an empty selector.
---------
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: iamsivin
Co-authored-by: Sony Mathew <2040199+sony-mathew@users.noreply.github.com>
---
.../api/v1/accounts/contacts_controller.rb | 2 +
.../Companies/CompanyCreateDialog.vue | 9 +-
.../Companies/CompanySelector.vue | 153 ++++++++++++++++++
.../Contacts/ContactsCard/ContactsCard.vue | 2 +
.../Contacts/ContactsForm/ContactsForm.vue | 43 ++++-
.../Contacts/Pages/ContactsList.vue | 1 +
.../components-next/combobox/ComboBox.vue | 8 +-
.../combobox/ComboBoxDropdown.vue | 2 +-
.../dashboard/i18n/locale/en/companies.json | 4 +
.../companies/pages/CompaniesIndex.vue | 2 +-
.../store/modules/contacts/actions.js | 8 +-
.../modules/specs/contacts/actions.spec.js | 27 ++++
app/models/contact.rb | 4 +-
.../api/v1/models/_contact.json.jbuilder | 1 +
.../api/v1/accounts/contacts_controller.rb | 17 ++
.../app/models/enterprise/concerns/contact.rb | 11 ++
.../contacts/company_association_service.rb | 6 +-
.../v1/accounts/contacts_controller_spec.rb | 6 +-
.../companies/contacts_controller_spec.rb | 28 +++-
.../v1/accounts/contacts_controller_spec.rb | 24 +++
.../contact_company_association_spec.rb | 16 ++
.../company_association_service_spec.rb | 1 +
spec/jobs/slack_unfurl_job_spec.rb | 4 +-
23 files changed, 355 insertions(+), 24 deletions(-)
create mode 100644 app/javascript/dashboard/components-next/Companies/CompanySelector.vue
create mode 100644 enterprise/app/controllers/enterprise/api/v1/accounts/contacts_controller.rb
create mode 100644 spec/enterprise/controllers/api/v1/accounts/contacts_controller_spec.rb
diff --git a/app/controllers/api/v1/accounts/contacts_controller.rb b/app/controllers/api/v1/accounts/contacts_controller.rb
index eafda0fe2..bc1082583 100644
--- a/app/controllers/api/v1/accounts/contacts_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts_controller.rb
@@ -214,3 +214,5 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
render json: error, status: error_status
end
end
+
+Api::V1::Accounts::ContactsController.prepend_mod_with('Api::V1::Accounts::ContactsController')
diff --git a/app/javascript/dashboard/components-next/Companies/CompanyCreateDialog.vue b/app/javascript/dashboard/components-next/Companies/CompanyCreateDialog.vue
index b3847030b..4b9d0b466 100644
--- a/app/javascript/dashboard/components-next/Companies/CompanyCreateDialog.vue
+++ b/app/javascript/dashboard/components-next/Companies/CompanyCreateDialog.vue
@@ -26,6 +26,13 @@ const resetForm = () => {
form.description = '';
};
+const open = (company = {}) => {
+ form.name = company.name || '';
+ form.domain = company.domain || '';
+ form.description = company.description || '';
+ dialogRef.value?.open();
+};
+
const handleConfirm = () => {
if (isFormInvalid.value) return;
@@ -45,7 +52,7 @@ const onSuccess = () => {
closeDialog();
};
-defineExpose({ dialogRef, onSuccess });
+defineExpose({ dialogRef, onSuccess, open });
diff --git a/app/javascript/dashboard/components-next/Companies/CompanySelector.vue b/app/javascript/dashboard/components-next/Companies/CompanySelector.vue
new file mode 100644
index 000000000..f8cfc8058
--- /dev/null
+++ b/app/javascript/dashboard/components-next/Companies/CompanySelector.vue
@@ -0,0 +1,153 @@
+
+
+
+
Date: Tue, 16 Jun 2026 18:56:30 +0530
Subject: [PATCH 12/26] feat: scale email rate limits by agent count for paid
plans (#13966)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Paid plan accounts with many agents were hitting the flat daily email
rate limit cap.
This multiplies the plan base limit by the account's agent seat count,
so larger teams
get proportionally higher limits. Free/hacker plan keeps the flat limit
unchanged.
Fixes https://linear.app/chatwoot/issue/CW-6664
## How to test
1. Set up `ACCOUNT_EMAILS_PLAN_LIMITS` config with plan limits (e.g.,
`{"hacker": 10, "startups": 20, "business": 30, "enterprise": 40}`)
2. Create an account on a paid plan (e.g., startups) with multiple agent
seats
3. Verify `account.email_rate_limit` returns `base_limit × agent_seats`
(e.g., 20 × 5 = 100)
4. Create an account on the hacker plan — verify limit stays flat (10)
5. Set a per-account override via super admin `limits.emails` — verify
it takes priority over the multiplied limit
## What changed
- `plan_email_limit` now multiplies the base plan limit by agent seat
count for paid plans
- Added `free_plan?` helper to skip the multiplier for the default/free
plan
---
.../enterprise/account/plan_usage_and_limits.rb | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb b/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb
index 0937c7b82..9b5093507 100644
--- a/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb
+++ b/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb
@@ -75,6 +75,14 @@ module Enterprise::Account::PlanUsageAndLimits # rubocop:disable Metrics/ModuleL
end
def plan_email_limit
+ base_limit = plan_base_email_limit
+ return nil if base_limit.nil?
+ return base_limit if free_plan?
+
+ base_limit * [agent_limits.to_i, 1].max
+ end
+
+ def plan_base_email_limit
config = InstallationConfig.find_by(name: 'ACCOUNT_EMAILS_PLAN_LIMITS')&.value
return nil if config.blank? || plan_name.blank?
@@ -84,6 +92,11 @@ module Enterprise::Account::PlanUsageAndLimits # rubocop:disable Metrics/ModuleL
nil
end
+ def free_plan?
+ default_plan = InstallationConfig.find_by(name: 'CHATWOOT_CLOUD_PLANS')&.value&.first
+ default_plan.present? && plan_name&.downcase == default_plan['name']&.downcase
+ end
+
def default_captain_limits
max_limits = { documents: ChatwootApp.max_limit, responses: ChatwootApp.max_limit }.with_indifferent_access
zero_limits = { documents: 0, responses: 0 }.with_indifferent_access
From 64b0ebd8dc082fad4fe06cb14da9c5dd72f23b28 Mon Sep 17 00:00:00 2001
From: Francisco Brito <90341639+FranciscoJBrito@users.noreply.github.com>
Date: Tue, 16 Jun 2026 10:42:49 -0300
Subject: [PATCH 13/26] feat: Script to migrate images between providers
(#9117)
# Pull Request Template
## Description
Storage migration functionality, which allows the transfer of images
from one on-premises provider to another (e.g. AWS, Google, etc.) using
Active Storage.
I ran the unit and integration tests and they all passed correctly.
**The command to execute the migration is `FROM=from_service
TO=to_service rake storage:migrate`**
Fixes #7907
## Type of change
Please delete options that are not relevant.
- [x] New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
I have tested the storage migration functionality by running the
provided unit and integration tests. Additionally, I manually tested the
migration process in a local development environment by following these
steps:
Set up two storage services (e.g., AWS S3 and Google Cloud Storage) with
valid configurations.
Execute the `FROM=local TO=amazon rake storage:migrate` task with
appropriate FROM and TO arguments to migrate blobs between the services.
Verified that the blobs were successfully transferred to the target
storage service.
Checked for any error messages or unexpected behavior during the
migration process.
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [x] I have commented on my code, particularly in hard-to-understand
areas
- [x] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [x] Any dependent changes have been merged and published in downstream
modules
---------
Co-authored-by: Sony Mathew
Co-authored-by: Sony Mathew <2040199+sony-mathew@users.noreply.github.com>
---
lib/active_storage/migrator.rb | 52 ++++++
lib/tasks/storage_migrations.rake | 13 ++
spec/lib/active_storage/migrator_spec.rb | 175 ++++++++++++++++++
.../rake/task_storage_migrations_spec.rb | 64 +++++++
spec/rails_helper.rb | 4 +
5 files changed, 308 insertions(+)
create mode 100644 lib/active_storage/migrator.rb
create mode 100644 lib/tasks/storage_migrations.rake
create mode 100644 spec/lib/active_storage/migrator_spec.rb
create mode 100644 spec/lib/tasks/rake/task_storage_migrations_spec.rb
diff --git a/lib/active_storage/migrator.rb b/lib/active_storage/migrator.rb
new file mode 100644
index 000000000..0fdf1669d
--- /dev/null
+++ b/lib/active_storage/migrator.rb
@@ -0,0 +1,52 @@
+require 'yaml'
+require 'erb'
+
+class ActiveStorage::Migrator
+ def self.migrate(from_service_name, to_service_name, should_update_service_name: true)
+ configs = load_storage_config
+ # Check if services are configured correctly
+ if configs[from_service_name.to_s].nil? || configs[to_service_name.to_s].nil?
+ raise "Error: The services '#{from_service_name}' or '#{to_service_name}' are not configured correctly."
+ end
+
+ from_service = configure_service(from_service_name, configs)
+
+ configure_blob_service(from_service)
+
+ migrate_blobs(from_service_name, to_service_name, should_update_service_name: should_update_service_name)
+ end
+
+ def self.load_storage_config
+ yaml_with_env = ERB.new(File.read('config/storage.yml')).result
+ YAML.load(yaml_with_env)
+ end
+
+ def self.configure_blob_service(service)
+ ActiveStorage::Blob.service = service
+ end
+
+ def self.configure_service(service_name, configs = load_storage_config)
+ service_config = configs[service_name.to_s]
+ ActiveStorage::Service.configure(service_name, { service_name.to_sym => service_config })
+ end
+
+ def self.migrate_blobs(from_service_name, to_service_name, should_update_service_name: true)
+ to_service = configure_service(to_service_name)
+ blobs = ActiveStorage::Blob.where(service_name: from_service_name.to_s)
+ Rails.logger.debug { "#{blobs.count} Blobs to migrate from #{from_service_name} to #{to_service_name}" }
+
+ blobs.find_each do |blob|
+ Rails.logger.debug { '.' }
+
+ blob.open do |io|
+ checksum = blob.checksum
+ to_service.upload(blob.key, io, checksum: checksum)
+ end
+
+ blob.update!(service_name: to_service_name.to_s) if should_update_service_name
+ rescue ActiveStorage::FileNotFoundError => e
+ Rails.logger.warn { "Skipping missing blob #{blob.id} (#{blob.key}): #{e.message}" }
+ end
+ Rails.logger.debug { 'Successful migration' }
+ end
+end
diff --git a/lib/tasks/storage_migrations.rake b/lib/tasks/storage_migrations.rake
new file mode 100644
index 000000000..9a864db4e
--- /dev/null
+++ b/lib/tasks/storage_migrations.rake
@@ -0,0 +1,13 @@
+namespace :storage do
+ desc 'Migrate blobs from one storage service to another'
+ # Example: FROM=local TO=amazon UPDATE_BLOB_SERVICE_NAME=true bundle exec rake storage:migrate
+ task migrate: :environment do
+ from_service = ENV.fetch('FROM', nil)
+ to_service = ENV.fetch('TO', nil)
+ should_update_service_name = ActiveModel::Type::Boolean.new.cast(ENV.fetch('UPDATE_BLOB_SERVICE_NAME', true))
+
+ raise 'Missing FROM or TO argument. Usage: FROM=service_name TO=service_name rake storage:migrate' if from_service.nil? || to_service.nil?
+
+ ActiveStorage::Migrator.migrate(from_service.to_sym, to_service.to_sym, should_update_service_name: should_update_service_name)
+ end
+end
diff --git a/spec/lib/active_storage/migrator_spec.rb b/spec/lib/active_storage/migrator_spec.rb
new file mode 100644
index 000000000..748e18174
--- /dev/null
+++ b/spec/lib/active_storage/migrator_spec.rb
@@ -0,0 +1,175 @@
+require 'rails_helper'
+require 'fileutils'
+require 'stringio'
+require 'tmpdir'
+
+RSpec.describe ActiveStorage::Migrator do
+ around do |example|
+ original_services = ActiveStorage::Blob.services
+ original_service = ActiveStorage::Blob.service
+
+ example.run
+ ensure
+ ActiveStorage::Blob.services = original_services
+ ActiveStorage::Blob.service = original_service
+ end
+
+ describe '.migrate' do
+ let(:from_service_stub) { instance_double(ActiveStorage::Service, name: 'local') }
+ let(:to_service_stub) { instance_double(ActiveStorage::Service, name: 'amazon') }
+
+ before do
+ allow(ActiveStorage::Service).to receive(:configure).with('local', any_args).and_return(from_service_stub)
+ allow(ActiveStorage::Service).to receive(:configure).with('amazon', any_args).and_return(to_service_stub)
+ end
+
+ context 'when services are configured correctly' do
+ it 'migrates blobs from one service to another' do
+ expect(ActiveStorage::Service).to receive(:configure).with('local', any_args)
+ expect(described_class).to receive(:migrate_blobs).with('local', 'amazon', should_update_service_name: true)
+ expect { described_class.migrate('local', 'amazon') }.not_to raise_error
+ end
+
+ it 'passes the service-name update flag to blob migration' do
+ expect(described_class).to receive(:migrate_blobs).with('local', 'amazon', should_update_service_name: false)
+
+ described_class.migrate('local', 'amazon', should_update_service_name: false)
+ end
+
+ it 'does not override the application logger' do
+ allow(described_class).to receive(:migrate_blobs)
+
+ expect(Rails).not_to receive(:logger=)
+
+ described_class.migrate('local', 'amazon')
+ end
+ end
+
+ context 'when services are not configured correctly' do
+ it 'prints an error message' do
+ allow(ActiveStorage::Service).to receive(:configure).and_return(nil)
+ expect do
+ described_class.migrate('random', 'random')
+ end.to raise_error(RuntimeError, "Error: The services 'random' or 'random' are not configured correctly.")
+ end
+ end
+ end
+
+ describe '.migrate_blobs' do
+ let(:from_root) { Dir.mktmpdir('active-storage-local') }
+ let(:to_root) { Dir.mktmpdir('active-storage-amazon') }
+ let(:other_root) { Dir.mktmpdir('active-storage-other') }
+ let(:from_service) { build_disk_service('local', from_root) }
+ let(:to_service) { build_disk_service('amazon', to_root) }
+ let(:other_service) { build_disk_service('other', other_root) }
+
+ before do
+ allow(described_class).to receive(:configure_service).with(:amazon).and_return(to_service)
+ end
+
+ around do |example|
+ original_services = ActiveStorage::Blob.services
+ original_service = ActiveStorage::Blob.service
+
+ ActiveStorage::Blob.services = {
+ 'local' => from_service,
+ 'amazon' => to_service,
+ 'other' => other_service
+ }
+ ActiveStorage::Blob.service = from_service
+
+ example.run
+ ensure
+ ActiveStorage::Blob.services = original_services
+ ActiveStorage::Blob.service = original_service
+ FileUtils.rm_rf([from_root, to_root, other_root])
+ end
+
+ it 'uploads non-image blobs and updates their service name' do
+ blob = create_blob(service_name: 'local', filename: 'invoice.pdf', content_type: 'application/pdf', content: 'pdf-content')
+
+ described_class.migrate_blobs(:local, :amazon, should_update_service_name: true)
+
+ expect(blob).not_to be_image
+ expect(blob.reload.service_name).to eq('amazon')
+ expect(to_service.download(blob.key)).to eq('pdf-content')
+ end
+
+ it 'only migrates blobs from the source service' do
+ local_blob = create_blob(service_name: 'local', filename: 'audio.mp3', content_type: 'audio/mpeg', content: 'audio-content')
+ other_blob = create_blob(service_name: 'other', filename: 'other.pdf', content_type: 'application/pdf', content: 'other-content')
+
+ described_class.migrate_blobs(:local, :amazon, should_update_service_name: true)
+
+ expect(local_blob.reload.service_name).to eq('amazon')
+ expect(to_service.download(local_blob.key)).to eq('audio-content')
+ expect(other_blob.reload.service_name).to eq('other')
+ expect(to_service.exist?(other_blob.key)).to be(false)
+ expect(other_service.download(other_blob.key)).to eq('other-content')
+ end
+
+ it 'skips missing source files and continues migration' do
+ missing_blob = create_blob(service_name: 'local', filename: 'missing.pdf', content_type: 'application/pdf', content: 'missing-content')
+ existing_blob = create_blob(service_name: 'local', filename: 'existing.pdf', content_type: 'application/pdf', content: 'existing-content')
+
+ from_service.delete(missing_blob.key)
+
+ expect do
+ described_class.migrate_blobs(:local, :amazon, should_update_service_name: true)
+ end.not_to raise_error
+
+ expect(missing_blob.reload.service_name).to eq('local')
+ expect(to_service.exist?(missing_blob.key)).to be(false)
+ expect(existing_blob.reload.service_name).to eq('amazon')
+ expect(to_service.download(existing_blob.key)).to eq('existing-content')
+ end
+
+ it 'does not update the blob service when upload fails' do
+ blob = create_blob(service_name: 'local', filename: 'report.pdf', content_type: 'application/pdf', content: 'report-content')
+
+ allow(to_service).to receive(:upload).and_raise(ActiveStorage::IntegrityError)
+
+ expect do
+ described_class.migrate_blobs(:local, :amazon, should_update_service_name: true)
+ end.to raise_error(ActiveStorage::IntegrityError)
+
+ expect(blob.reload.service_name).to eq('local')
+ expect(to_service.exist?(blob.key)).to be(false)
+ end
+
+ it 'skips the blob service update when the flag is disabled' do
+ blob = create_blob(service_name: 'local', filename: 'manual.pdf', content_type: 'application/pdf', content: 'manual-content')
+
+ described_class.migrate_blobs(:local, :amazon, should_update_service_name: false)
+
+ expect(blob.reload.service_name).to eq('local')
+ expect(to_service.download(blob.key)).to eq('manual-content')
+ end
+
+ it 'does not rewrite blobs that were already migrated' do
+ blob = create_blob(service_name: 'local', filename: 'archive.pdf', content_type: 'application/pdf', content: 'archive-content')
+
+ allow(to_service).to receive(:upload).and_call_original
+
+ 2.times { described_class.migrate_blobs(:local, :amazon, should_update_service_name: true) }
+
+ expect(to_service).to have_received(:upload).with(blob.key, an_instance_of(Tempfile), checksum: blob.checksum).once
+ expect(blob.reload.service_name).to eq('amazon')
+ expect(ActiveStorage::Blob.where(id: blob.id, service_name: 'local')).to be_empty
+ end
+
+ def build_disk_service(service_name, root)
+ ActiveStorage::Service.configure(service_name, { service_name => { service: 'Disk', root: root } })
+ end
+
+ def create_blob(service_name:, filename:, content_type:, content:)
+ ActiveStorage::Blob.create_and_upload!(
+ io: StringIO.new(content),
+ filename: filename,
+ content_type: content_type,
+ service_name: service_name,
+ identify: false
+ )
+ end
+ end
+end
diff --git a/spec/lib/tasks/rake/task_storage_migrations_spec.rb b/spec/lib/tasks/rake/task_storage_migrations_spec.rb
new file mode 100644
index 000000000..552c814b3
--- /dev/null
+++ b/spec/lib/tasks/rake/task_storage_migrations_spec.rb
@@ -0,0 +1,64 @@
+require 'rake'
+require 'rails_helper'
+
+RSpec.describe Rake::Task do
+ describe 'storage_migrations' do
+ describe 'rake task' do
+ subject(:task) { described_class['storage:migrate'] }
+
+ before do
+ task.reenable
+ end
+
+ context 'when FROM argument is missing' do
+ it 'raises an error' do
+ with_modified_env FROM: nil, TO: 'amazon' do
+ expect do
+ task.invoke
+ end.to raise_error(RuntimeError,
+ 'Missing FROM or TO argument. Usage: FROM=service_name TO=service_name rake storage:migrate')
+ end
+ end
+ end
+
+ context 'when TO argument is missing' do
+ it 'raises an error' do
+ with_modified_env FROM: 'service_name', TO: nil do
+ expect do
+ task.invoke
+ end.to raise_error(RuntimeError,
+ 'Missing FROM or TO argument. Usage: FROM=service_name TO=service_name rake storage:migrate')
+ end
+ end
+ end
+
+ context 'when required arguments are present' do
+ it 'updates blob service names by default' do
+ expect(ActiveStorage::Migrator).to receive(:migrate).with(:local, :amazon, should_update_service_name: true)
+
+ with_modified_env FROM: 'local', TO: 'amazon', UPDATE_BLOB_SERVICE_NAME: nil do
+ task.invoke
+ end
+ end
+
+ it 'skips updating blob service names when disabled' do
+ expect(ActiveStorage::Migrator).to receive(:migrate).with(:local, :amazon, should_update_service_name: false)
+
+ with_modified_env FROM: 'local', TO: 'amazon', UPDATE_BLOB_SERVICE_NAME: 'false' do
+ task.invoke
+ end
+ end
+
+ it 'can be invoked again after the task is re-enabled' do
+ expect(ActiveStorage::Migrator).to receive(:migrate).twice.with(:local, :amazon, should_update_service_name: true)
+
+ with_modified_env FROM: 'local', TO: 'amazon', UPDATE_BLOB_SERVICE_NAME: nil do
+ task.invoke
+ task.reenable
+ task.invoke
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index e83db4046..984cd045f 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -7,6 +7,10 @@ require 'rspec/rails'
require 'pundit/rspec'
require 'sidekiq/testing'
+# Load Rake tasks
+require 'rake'
+Rails.application.load_tasks
+
# test-prof helpers for tests optimization
require 'test_prof/recipes/rspec/before_all'
require 'test_prof/recipes/rspec/let_it_be'
From a5858536905c61b7d9ee83ad82542b2c168df784 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan
Date: Tue, 16 Jun 2026 19:40:24 +0530
Subject: [PATCH 14/26] chore: expose advanced_search flag in super_admin UI
for self-hosted (#14750)
## Description
Removes `chatwoot_internal: true` from the `advanced_search` feature
flag so self-hosted enterprise userss can toggle it from the super_admin
UI instead of going through a rails console.
---
config/features.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/config/features.yml b/config/features.yml
index 03105588b..c5bc8f608 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -200,7 +200,6 @@
display_name: Advanced Search
enabled: false
premium: true
- chatwoot_internal: true
- name: saml
display_name: SAML
enabled: false
From 352f120c6a1f6480336f77fcd6427772f2e47c73 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Tue, 16 Jun 2026 20:01:31 +0530
Subject: [PATCH 15/26] feat: add dedicated color tokens for voice call widget
(#14745)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
# Pull Request Template
## Description
This PR introduces dedicated color tokens for the floating voice call
widget instead of reusing generic design tokens. This allows the widget
to maintain a distinct dark-card appearance across both light and dark
themes.
Adds the following tokens and applies them to `CallCard`:
* `--call-widget`
* `--call-widget-border`
* `--call-widget-text`
* `--call-widget-sub-text`
Fixes
https://linear.app/chatwoot/issue/CW-7353/call-notification-window-theme-update-design
## Type of change
- [x] New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
### Screenshots
**Light mode**
**Dark mode**
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [x] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---
.../dashboard/assets/scss/_next-colors.scss | 12 ++++++++++
.../components-next/call/CallCard.vue | 24 +++++++++----------
theme/colors.js | 5 ++++
3 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/app/javascript/dashboard/assets/scss/_next-colors.scss b/app/javascript/dashboard/assets/scss/_next-colors.scss
index 784edce6c..4a67e5182 100644
--- a/app/javascript/dashboard/assets/scss/_next-colors.scss
+++ b/app/javascript/dashboard/assets/scss/_next-colors.scss
@@ -145,6 +145,12 @@
--black-alpha-2: 0, 0, 0, 0.04;
--border-blue: 39, 129, 246, 0.5;
--white-alpha: 255, 255, 255, 0.8;
+
+ // Voice call widget - light mode
+ --call-widget: 33, 34, 38, 0.95;
+ --call-widget-border: 255, 255, 255, 0.1;
+ --call-widget-text: 237, 238, 240, 1;
+ --call-widget-sub-text: 173, 177, 184, 1;
}
.dark {
@@ -291,6 +297,12 @@
--border-blue: 39, 129, 246, 0.5;
--border-container: 255, 255, 255, 0;
--white-alpha: 255, 255, 255, 0.1;
+
+ // Voice call widget - dark mode
+ --call-widget: 50, 53, 61, 1;
+ --call-widget-border: 255, 255, 255, 0.07;
+ --call-widget-text: 237, 238, 240, 1;
+ --call-widget-sub-text: 173, 177, 184, 1;
}
}
// NEXT COLORS END
diff --git a/app/javascript/dashboard/components-next/call/CallCard.vue b/app/javascript/dashboard/components-next/call/CallCard.vue
index 55da3dacf..d041150c2 100644
--- a/app/javascript/dashboard/components-next/call/CallCard.vue
+++ b/app/javascript/dashboard/components-next/call/CallCard.vue
@@ -75,11 +75,11 @@ const channelIcon = computed(() => {
-
+
@@ -100,10 +100,10 @@ const channelIcon = computed(() => {
{{ duration }}
@@ -132,7 +132,7 @@ const channelIcon = computed(() => {
slate
ghost
xs
- class="!rounded-full -my-1"
+ class="!rounded-full -my-1 -me-1 !text-n-call-widget-sub-text"
@click="$emit('dismiss')"
/>
@@ -149,13 +149,13 @@ const channelIcon = computed(() => {
{{ callInfo.contactName }}
{{ callInfo.phoneNumber }}
@@ -217,23 +217,23 @@ const channelIcon = computed(() => {
>
)',
container: 'rgba(var(--border-container))',
From fe6368b42ef2de901dffdc0c1a4d1b84a112db5d Mon Sep 17 00:00:00 2001
From: Sony Mathew
Date: Tue, 16 Jun 2026 23:46:49 +0530
Subject: [PATCH 16/26] feat: Add sidebar unread counts for filters (CW-7262)
(#14726)
## Description
Extends the conversation unread-count system so the left sidebar can
show unread badges for Mentions, Participating, Unattended, and saved
conversation folders. Folder badges reuse the existing `custom_filters`
conversation filter semantics, store user-scoped Redis sets lazily, and
skip unsupported folder filters so invalid saved folders continue to
render without a badge. The Unattended badge counts all visible unread
open conversations that match the existing unattended conversation
scope.
Closes
-
[CW-7262](https://linear.app/chatwoot/issue/CW-7262/unread-counts-for-filters-folders)
## What changed
- Added user-scoped unread-count Redis keys and cache builders for
mentions, participating conversations, unattended conversations, and
saved folder filters.
- Reused `Conversations::FilterService` through a relation-returning
path so folder counts match the folder conversation list behavior.
- Invalidated user filter caches from mention, participant,
custom-filter, and relevant conversation update events.
- Extended the unread-count endpoint payload and sidebar Vuex/sidebar
rendering for the new badge counts, including the Unattended sidebar
item.
- Added Ruby, Enterprise, request, listener, and frontend store coverage
for the new unread-count dimensions.
## Type of change
- [x] New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
- Created local validation folders for `john@acme.inc` and confirmed the
unread-count payload includes open, resolved, and high-priority folder
badges while excluding the invalid unsupported folder.
- Added coverage for the Unattended badge rule: all visible unread open
conversations matching `Conversation.unattended`.
- Ran focused unread-count Ruby specs, including service, listener,
request, and Enterprise counter coverage.
- Ran frontend unread-count store specs.
- Ran RuboCop on the touched Ruby files.
- Ran ESLint through the project script; it completed with warnings in
existing unrelated files and no errors.
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [x] I have commented on my code, particularly in hard-to-understand
areas
- [x] Documentation changes are not required for this internal
unread-count behavior
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [x] No dependent downstream changes are required
---------
Co-authored-by: Muhsin Keloth
---
app/finders/conversation_finder.rb | 2 +-
.../components-next/sidebar/ChannelLeaf.vue | 6 +-
.../components-next/sidebar/Sidebar.vue | 38 +++
.../sidebar/SidebarCollapsedPopover.vue | 10 +-
.../sidebar/SidebarGroupLeaf.vue | 5 +-
.../sidebar/SidebarUnreadBadge.vue | 2 +
.../sidebar/specs/ChannelLeaf.spec.js | 12 +
.../sidebar/specs/SidebarGroupLeaf.spec.js | 19 +-
.../dashboard/i18n/locale/en/settings.json | 10 +
.../store/modules/conversationUnreadCounts.js | 23 ++
.../conversationUnreadCounts/getters.spec.js | 22 ++
.../mutations.spec.js | 19 ++
app/listeners/action_cable_listener.rb | 4 +-
app/models/account.rb | 2 +-
app/models/account_user.rb | 9 +
app/models/concerns/cache_keys.rb | 1 -
app/models/conversation_participant.rb | 5 +
app/models/custom_filter.rb | 9 +
app/models/inbox_member.rb | 12 +
app/models/mention.rb | 5 +
app/services/conversations/filter_service.rb | 10 +-
.../unread_counts/broadcast_scope.rb | 14 +-
.../unread_counts/build_lock_keys.rb | 15 ++
.../conversations/unread_counts/builder.rb | 139 ++++++++++-
.../conversations/unread_counts/counter.rb | 45 ++--
.../unread_counts/filter_counter.rb | 40 ++++
.../conversations/unread_counts/listener.rb | 39 +++-
.../conversations/unread_counts/notifier.rb | 4 +-
.../conversations/unread_counts/store.rb | 20 +-
.../conversations/unread_counts/store_keys.rb | 16 ++
.../unread_counts/user_filter_notifier.rb | 19 ++
.../unread_counts/user_filter_store.rb | 100 ++++++++
app/services/filter_service.rb | 12 +-
.../finders/enterprise/conversation_finder.rb | 26 +++
enterprise/app/models/custom_role.rb | 23 ++
lib/redis/redis_keys.rb | 15 ++
.../accounts/conversations_controller_spec.rb | 43 +++-
.../super_admin/accounts_controller_spec.rb | 2 +-
.../finders/conversation_finder_spec.rb | 24 ++
spec/enterprise/models/account_user_spec.rb | 18 ++
spec/enterprise/models/custom_role_spec.rb | 34 +++
.../unread_counts/counter_spec.rb | 60 +++--
spec/finders/conversation_finder_spec.rb | 19 ++
spec/listeners/action_cable_listener_spec.rb | 14 ++
spec/models/account_spec.rb | 63 ++++-
spec/models/account_user_spec.rb | 28 +++
spec/models/inbox_member_spec.rb | 26 +++
.../unread_counts/builder_spec.rb | 197 +++++++++++++++-
.../unread_counts/counter_spec.rb | 78 ++++++-
.../unread_counts/listener_spec.rb | 51 +++-
.../unread_counts/notifier_spec.rb | 12 +
.../unread_counts/refresher_spec.rb | 2 +-
.../conversations/unread_counts/store_spec.rb | 218 +++++++++++++++++-
.../user_filter_notifier_spec.rb | 37 +++
54 files changed, 1581 insertions(+), 97 deletions(-)
create mode 100644 app/services/conversations/unread_counts/build_lock_keys.rb
create mode 100644 app/services/conversations/unread_counts/filter_counter.rb
create mode 100644 app/services/conversations/unread_counts/user_filter_notifier.rb
create mode 100644 app/services/conversations/unread_counts/user_filter_store.rb
create mode 100644 spec/enterprise/finders/conversation_finder_spec.rb
create mode 100644 spec/services/conversations/unread_counts/user_filter_notifier_spec.rb
diff --git a/app/finders/conversation_finder.rb b/app/finders/conversation_finder.rb
index 74bf903f5..9d53ec97e 100644
--- a/app/finders/conversation_finder.rb
+++ b/app/finders/conversation_finder.rb
@@ -142,7 +142,7 @@ class ConversationFinder
conversation_ids = current_account.mentions.where(user: current_user).pluck(:conversation_id)
@conversations = @conversations.where(id: conversation_ids)
when 'participating'
- @conversations = current_user.participating_conversations.where(account_id: current_account.id)
+ @conversations = @conversations.where(id: current_user.participating_conversations.where(account_id: current_account.id).select(:id))
when 'unattended'
@conversations = @conversations.unattended
end
diff --git a/app/javascript/dashboard/components-next/sidebar/ChannelLeaf.vue b/app/javascript/dashboard/components-next/sidebar/ChannelLeaf.vue
index a995cf510..234737008 100644
--- a/app/javascript/dashboard/components-next/sidebar/ChannelLeaf.vue
+++ b/app/javascript/dashboard/components-next/sidebar/ChannelLeaf.vue
@@ -22,6 +22,10 @@ const props = defineProps({
type: [Number, String],
default: 0,
},
+ badgeTooltip: {
+ type: String,
+ default: '',
+ },
});
const reauthorizationRequired = computed(() => {
@@ -34,7 +38,7 @@ const reauthorizationRequired = computed(() => {
d'.freeze
UNREAD_CONVERSATIONS_BASE_READY = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::READY::BASE'.freeze
UNREAD_CONVERSATIONS_ASSIGNMENT_READY = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::READY::ASSIGNMENT'.freeze
+ UNREAD_CONVERSATIONS_USER_FILTERS_READY =
+ 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::READY::FILTERS'.freeze
+ UNREAD_CONVERSATIONS_FILTERS_VERSION = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::VERSION::FILTERS'.freeze
+ UNREAD_CONVERSATIONS_USER_FILTERS_VERSION =
+ 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::VERSION::FILTERS'.freeze
UNREAD_CONVERSATIONS_BASE_BUILD_LOCK = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::BUILD_LOCK::BASE'.freeze
UNREAD_CONVERSATIONS_ASSIGNMENT_BUILD_LOCK = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::BUILD_LOCK::ASSIGNMENT'.freeze
+ UNREAD_CONVERSATIONS_USER_FILTERS_BUILD_LOCK =
+ 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::BUILD_LOCK::FILTERS'.freeze
UNREAD_CONVERSATIONS_INBOX = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::INBOX::%d'.freeze
UNREAD_CONVERSATIONS_LABEL_INBOX =
'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::LABEL::%d::INBOX::%d'.freeze
@@ -33,6 +40,14 @@ module Redis::RedisKeys
'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::TEAM::%d::INBOX::%d::UNASSIGNED'.freeze
UNREAD_CONVERSATIONS_TEAM_INBOX_ASSIGNEE =
'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::TEAM::%d::INBOX::%d::ASSIGNEE::%d'.freeze
+ UNREAD_CONVERSATIONS_USER_MENTIONS =
+ 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::MENTIONS'.freeze
+ UNREAD_CONVERSATIONS_USER_PARTICIPATING =
+ 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::PARTICIPATING'.freeze
+ UNREAD_CONVERSATIONS_USER_UNATTENDED =
+ 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::UNATTENDED'.freeze
+ UNREAD_CONVERSATIONS_USER_FOLDER =
+ 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::FOLDER::%d'.freeze
## User Keys
# SSO Auth Tokens
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index bdb8117ac..de3cc4a3c 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -123,7 +123,7 @@ RSpec.describe 'Conversations API', type: :request do
end
after do
- Conversations::UnreadCounts::Store.clear_account!(account.id)
+ Conversations::UnreadCounts::Store.clear_all_account!(account.id)
end
context 'when conversation unread counts feature is enabled' do
@@ -144,7 +144,42 @@ RSpec.describe 'Conversations API', type: :request do
'all_count' => 1,
'inboxes' => { visible_inbox.id.to_s => 1 },
'labels' => { label.id.to_s => 1 },
- 'teams' => {}
+ 'teams' => {},
+ 'mentions_count' => 0,
+ 'participating_count' => 0,
+ 'unattended_count' => 1,
+ 'folders' => {}
+ )
+ end
+
+ it 'returns unread counts for mentions, participating conversations, unattended conversations, and folders' do
+ mentioned_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
+ participating_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
+ resolved_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
+ resolved_conversation.update!(status: :resolved)
+ custom_filter = create(:custom_filter, account: account, user: agent, filter_type: :conversation, query: {
+ payload: [{
+ attribute_key: 'status',
+ filter_operator: 'equal_to',
+ values: ['resolved'],
+ query_operator: nil,
+ custom_attribute_type: ''
+ }]
+ })
+
+ create(:mention, account: account, conversation: mentioned_conversation, user: agent)
+ create(:conversation_participant, account: account, conversation: participating_conversation, user: agent)
+
+ get "/api/v1/accounts/#{account.id}/conversations/unread_counts",
+ headers: agent.create_new_auth_token,
+ as: :json
+
+ expect(response).to have_http_status(:success)
+ expect(response.parsed_body['payload']).to include(
+ 'mentions_count' => 1,
+ 'participating_count' => 1,
+ 'unattended_count' => 2,
+ 'folders' => { custom_filter.id.to_s => 1 }
)
end
@@ -862,7 +897,7 @@ RSpec.describe 'Conversations API', type: :request do
expect(response).to have_http_status(:success)
expect(Conversations::UnreadCounts::Store.counts_for_keys([inbox_key])).to eq(inbox_key => 0)
ensure
- Conversations::UnreadCounts::Store.clear_account!(account.id)
+ Conversations::UnreadCounts::Store.clear_all_account!(account.id)
end
it 'updates both if one timestamp is old even when the other is recent' do
@@ -949,7 +984,7 @@ RSpec.describe 'Conversations API', type: :request do
expect(response).to have_http_status(:success)
expect(Conversations::UnreadCounts::Store.counts_for_keys([inbox_key])).to eq(inbox_key => 1)
ensure
- Conversations::UnreadCounts::Store.clear_account!(account.id)
+ Conversations::UnreadCounts::Store.clear_all_account!(account.id)
end
end
end
diff --git a/spec/controllers/super_admin/accounts_controller_spec.rb b/spec/controllers/super_admin/accounts_controller_spec.rb
index e4ff81a08..917499cd5 100644
--- a/spec/controllers/super_admin/accounts_controller_spec.rb
+++ b/spec/controllers/super_admin/accounts_controller_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe 'Super Admin accounts API', type: :request do
end
after do
- Conversations::UnreadCounts::Store.clear_account!(account.id)
+ Conversations::UnreadCounts::Store.clear_all_account!(account.id)
end
context 'when it is an unauthenticated user' do
diff --git a/spec/enterprise/finders/conversation_finder_spec.rb b/spec/enterprise/finders/conversation_finder_spec.rb
new file mode 100644
index 000000000..f8b9fce58
--- /dev/null
+++ b/spec/enterprise/finders/conversation_finder_spec.rb
@@ -0,0 +1,24 @@
+require 'rails_helper'
+
+RSpec.describe ConversationFinder do
+ describe '#perform' do
+ it 'returns participant-only conversations for custom roles with participating permission' do
+ account = create(:account)
+ agent = create(:user, account: account, role: :agent)
+ other_agent = create(:user, account: account, role: :agent)
+ inbox = create(:inbox, account: account, enable_auto_assignment: false)
+ custom_role = create(:custom_role, account: account, permissions: ['conversation_participating_manage'])
+ participating_conversation = create(:conversation, account: account, inbox: inbox, assignee: other_agent)
+
+ create(:inbox_member, user: agent, inbox: inbox)
+ create(:inbox_member, user: other_agent, inbox: inbox)
+ create(:conversation_participant, account: account, conversation: participating_conversation, user: agent)
+ account.account_users.find_by!(user_id: agent.id).update!(custom_role: custom_role)
+ Current.account = account
+
+ result = described_class.new(agent, { status: 'open', conversation_type: 'participating' }).perform
+
+ expect(result[:conversations].map(&:id)).to include(participating_conversation.id)
+ end
+ end
+end
diff --git a/spec/enterprise/models/account_user_spec.rb b/spec/enterprise/models/account_user_spec.rb
index fb572e86a..e157d9acd 100644
--- a/spec/enterprise/models/account_user_spec.rb
+++ b/spec/enterprise/models/account_user_spec.rb
@@ -29,6 +29,24 @@ RSpec.describe AccountUser, type: :model do
end
end
+ describe 'unread filter count invalidation' do
+ it 'notifies when the assigned custom role changes' do
+ account = create(:account)
+ custom_role = create(:custom_role, account: account)
+ account_user = create(:account_user, account: account)
+ notifier = instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true)
+ allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
+
+ account_user.update!(custom_role: custom_role)
+
+ expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(
+ account: account,
+ user: account_user.user
+ )
+ expect(notifier).to have_received(:perform)
+ end
+ end
+
describe 'audit log' do
context 'when account user is created' do
it 'has associated audit log created' do
diff --git a/spec/enterprise/models/custom_role_spec.rb b/spec/enterprise/models/custom_role_spec.rb
index f63f3c2dd..553a5a33a 100644
--- a/spec/enterprise/models/custom_role_spec.rb
+++ b/spec/enterprise/models/custom_role_spec.rb
@@ -9,4 +9,38 @@ RSpec.describe CustomRole, type: :model do
describe 'validations' do
it { is_expected.to validate_presence_of(:name) }
end
+
+ describe 'unread filter count invalidation' do
+ it 'notifies assigned users when permissions change' do
+ account = create(:account)
+ custom_role = create(:custom_role, account: account, permissions: ['conversation_participating_manage'])
+ account_user = create(:account_user, account: account, custom_role: custom_role)
+ notifier = instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true)
+ allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
+
+ custom_role.update!(permissions: ['conversation_manage'])
+
+ expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(
+ account: account,
+ user: account_user.user
+ )
+ expect(notifier).to have_received(:perform)
+ end
+
+ it 'notifies assigned users when the custom role is destroyed' do
+ account = create(:account)
+ custom_role = create(:custom_role, account: account, permissions: ['conversation_participating_manage'])
+ account_user = create(:account_user, account: account, custom_role: custom_role)
+ notifier = instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true)
+ allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
+
+ custom_role.destroy!
+
+ expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(
+ account: account,
+ user: account_user.user
+ )
+ expect(notifier).to have_received(:perform)
+ end
+ end
end
diff --git a/spec/enterprise/services/conversations/unread_counts/counter_spec.rb b/spec/enterprise/services/conversations/unread_counts/counter_spec.rb
index e8f850e78..86a93bd8c 100644
--- a/spec/enterprise/services/conversations/unread_counts/counter_spec.rb
+++ b/spec/enterprise/services/conversations/unread_counts/counter_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Conversations::UnreadCounts::Counter do
end
after do
- store.clear_account!(account.id)
+ store.clear_all_account!(account.id)
end
it 'uses base counts for custom roles with conversation_manage permission' do
@@ -26,10 +26,16 @@ RSpec.describe Conversations::UnreadCounts::Counter do
result = described_class.new(account: account, user: agent).perform
- expect(result[:all_count]).to eq(2)
- expect(result[:inboxes]).to eq(inbox.id.to_s => 2)
- expect(result[:labels]).to eq(label.id.to_s => 2)
- expect(result[:teams]).to eq(team.id.to_s => 2)
+ expect(result).to eq(
+ all_count: 2,
+ inboxes: { inbox.id.to_s => 2 },
+ labels: { label.id.to_s => 2 },
+ teams: { team.id.to_s => 2 },
+ mentions_count: 0,
+ participating_count: 0,
+ unattended_count: 2,
+ folders: {}
+ )
expect(store.assignment_ready?(account.id)).to be(false)
end
@@ -37,14 +43,21 @@ RSpec.describe Conversations::UnreadCounts::Counter do
account_user.update!(custom_role: create(:custom_role, account: account, permissions: ['conversation_unassigned_manage']))
create_unread_conversation(account: account, inbox: inbox, labels: [label.title], assignee: agent, team: team)
create_unread_conversation(account: account, inbox: inbox, labels: [label.title], team: team)
- create_unread_conversation(account: account, inbox: inbox, labels: [label.title], assignee: other_agent, team: team)
+ other_assigned_conversation = create_unread_conversation(account: account, inbox: inbox, labels: [label.title], assignee: other_agent, team: team)
+ create(:conversation_participant, account: account, conversation: other_assigned_conversation, user: agent)
result = described_class.new(account: account, user: agent).perform
- expect(result[:all_count]).to eq(2)
- expect(result[:inboxes]).to eq(inbox.id.to_s => 2)
- expect(result[:labels]).to eq(label.id.to_s => 2)
- expect(result[:teams]).to eq(team.id.to_s => 2)
+ expect(result).to eq(
+ all_count: 2,
+ inboxes: { inbox.id.to_s => 2 },
+ labels: { label.id.to_s => 2 },
+ teams: { team.id.to_s => 2 },
+ mentions_count: 0,
+ participating_count: 0,
+ unattended_count: 2,
+ folders: {}
+ )
expect(store.assignment_ready?(account.id)).to be(true)
end
@@ -52,13 +65,21 @@ RSpec.describe Conversations::UnreadCounts::Counter do
account_user.update!(custom_role: create(:custom_role, account: account, permissions: ['conversation_participating_manage']))
create_unread_conversation(account: account, inbox: inbox, labels: [label.title], assignee: agent, team: team)
create_unread_conversation(account: account, inbox: inbox, labels: [label.title], team: team)
+ participating_conversation = create_unread_conversation(account: account, inbox: inbox, labels: [label.title], team: team)
+ create(:conversation_participant, account: account, conversation: participating_conversation, user: agent)
result = described_class.new(account: account, user: agent).perform
- expect(result[:all_count]).to eq(1)
- expect(result[:inboxes]).to eq(inbox.id.to_s => 1)
- expect(result[:labels]).to eq(label.id.to_s => 1)
- expect(result[:teams]).to eq(team.id.to_s => 1)
+ expect(result).to eq(
+ all_count: 1,
+ inboxes: { inbox.id.to_s => 1 },
+ labels: { label.id.to_s => 1 },
+ teams: { team.id.to_s => 1 },
+ mentions_count: 0,
+ participating_count: 1,
+ unattended_count: 1,
+ folders: {}
+ )
expect(store.assignment_ready?(account.id)).to be(true)
end
@@ -68,7 +89,16 @@ RSpec.describe Conversations::UnreadCounts::Counter do
result = described_class.new(account: account, user: agent).perform
- expect(result).to eq(all_count: 0, inboxes: {}, labels: {}, teams: {})
+ expect(result).to eq(
+ all_count: 0,
+ inboxes: {},
+ labels: {},
+ teams: {},
+ mentions_count: 0,
+ participating_count: 0,
+ unattended_count: 0,
+ folders: {}
+ )
expect(store.base_ready?(account.id)).to be(false)
expect(store.assignment_ready?(account.id)).to be(false)
end
diff --git a/spec/finders/conversation_finder_spec.rb b/spec/finders/conversation_finder_spec.rb
index 64f134fe2..31cbceb6a 100644
--- a/spec/finders/conversation_finder_spec.rb
+++ b/spec/finders/conversation_finder_spec.rb
@@ -208,6 +208,25 @@ describe ConversationFinder do
end
end
+ context 'with participating conversation type' do
+ let(:params) { { status: 'open', conversation_type: 'participating' } }
+
+ it 'does not return participating conversations from inboxes where the agent is no longer a member' do
+ visible_conversation = create(:conversation, account: account, inbox: inbox)
+ inaccessible_conversation = create(:conversation, account: account, inbox: restricted_inbox)
+ create(:inbox_member, user: user_1, inbox: restricted_inbox)
+ create(:conversation_participant, account: account, conversation: visible_conversation, user: user_1)
+ create(:conversation_participant, account: account, conversation: inaccessible_conversation, user: user_1)
+ InboxMember.find_by!(user: user_1, inbox: restricted_inbox).destroy!
+
+ result = conversation_finder.perform
+ conversation_ids = result[:conversations].map(&:id)
+
+ expect(conversation_ids).to include(visible_conversation.id)
+ expect(conversation_ids).not_to include(inaccessible_conversation.id)
+ end
+ end
+
context 'without source' do
let(:params) { {} }
diff --git a/spec/listeners/action_cable_listener_spec.rb b/spec/listeners/action_cable_listener_spec.rb
index cdb9a93cb..7a774dbd5 100644
--- a/spec/listeners/action_cable_listener_spec.rb
+++ b/spec/listeners/action_cable_listener_spec.rb
@@ -294,5 +294,19 @@ describe ActionCableListener do
listener.conversation_unread_count_changed(event)
end
+
+ it 'supports user-scoped unread count refresh events' do
+ event = Events::Base.new(event_name, Time.zone.now, account: account, user: agent)
+
+ expect(ActionCableBroadcastJob).to receive(:perform_later).with(
+ a_collection_containing_exactly(agent.pubsub_token),
+ 'conversation.unread_count_changed',
+ {
+ account_id: account.id
+ }
+ )
+
+ listener.conversation_unread_count_changed(event)
+ end
end
end
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 38ca9694a..d77a16fdb 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -53,38 +53,79 @@ RSpec.describe Account do
describe 'conversation unread counts feature flag' do
let(:account) { create(:account) }
let(:inbox) { create(:inbox, account: account) }
+ let(:user) { create(:user) }
let(:store) { Conversations::UnreadCounts::Store }
let(:inbox_key) { store.inbox_key(account.id, inbox.id) }
-
- after do
- store.clear_account!(account.id)
+ let(:filter_keys) do
+ [
+ store.user_mentions_key(account.id, user.id),
+ store.user_participating_key(account.id, user.id),
+ store.user_unattended_key(account.id, user.id),
+ store.user_folder_key(account.id, user.id, 1)
+ ]
end
- it 'clears unread count cache when the feature is enabled' do
+ after do
+ store.clear_all_account!(account.id)
+ end
+
+ it 'clears all unread count cache when the feature is enabled' do
build_unread_count_cache
account.enable_features!(:conversation_unread_counts)
- expect(store.base_ready?(account.id)).to be(false)
- expect(store.assignment_ready?(account.id)).to be(false)
- expect(store.counts_for_keys([inbox_key])).to eq(inbox_key => 0)
+ expect_unread_count_cache_cleared
end
- it 'clears unread count cache when the feature is disabled' do
+ it 'clears all unread count cache when the feature is disabled' do
account.enable_features!(:conversation_unread_counts)
build_unread_count_cache
account.disable_features!(:conversation_unread_counts)
- expect(store.base_ready?(account.id)).to be(false)
- expect(store.assignment_ready?(account.id)).to be(false)
- expect(store.counts_for_keys([inbox_key])).to eq(inbox_key => 0)
+ expect_unread_count_cache_cleared
+ end
+
+ it 'clears all unread count cache when account cache keys are reset' do
+ build_unread_count_cache
+
+ account.reset_cache_keys
+
+ expect_unread_count_cache_cleared
+ end
+
+ def expect_unread_count_cache_cleared
+ expect(unread_count_ready_markers).to all(be(false))
+ expect(store.counts_for_keys(unread_count_keys).values).to all(eq(0))
+ end
+
+ def unread_count_ready_markers
+ [
+ store.base_ready?(account.id),
+ store.assignment_ready?(account.id),
+ store.filters_ready?(account.id, user.id)
+ ]
+ end
+
+ def unread_count_keys
+ [inbox_key] + filter_keys
end
def build_unread_count_cache
store.mark_base_ready!(account.id)
store.mark_assignment_ready!(account.id)
+ store.mark_filters_ready!(account.id, user.id)
store.add_base_membership(account_id: account.id, inbox_id: inbox.id, label_ids: [], conversation_id: 1)
+ store.add_filter_memberships(
+ account_id: account.id,
+ user_id: user.id,
+ filters: {
+ mentions: [1],
+ participating: [2],
+ unattended: [3]
+ },
+ folders: { 1 => [4] }
+ )
end
end
diff --git a/spec/models/account_user_spec.rb b/spec/models/account_user_spec.rb
index e5a560fe9..7acfc19cd 100644
--- a/spec/models/account_user_spec.rb
+++ b/spec/models/account_user_spec.rb
@@ -42,4 +42,32 @@ RSpec.describe AccountUser do
expect(user.assigned_conversations.count).to eq(0)
end
end
+
+ describe 'unread filter count invalidation' do
+ let(:notifier) { instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true) }
+
+ before do
+ allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
+ end
+
+ it 'notifies when the account role changes' do
+ account_user.update!(role: :administrator)
+
+ expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(
+ account: account_user.account,
+ user: account_user.user
+ )
+ expect(notifier).to have_received(:perform)
+ end
+
+ it 'notifies when account access is removed' do
+ expect(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).with(
+ account: account_user.account,
+ user: account_user.user
+ ).and_return(notifier)
+ expect(notifier).to receive(:perform)
+
+ account_user.destroy!
+ end
+ end
end
diff --git a/spec/models/inbox_member_spec.rb b/spec/models/inbox_member_spec.rb
index b081c546c..df569c695 100644
--- a/spec/models/inbox_member_spec.rb
+++ b/spec/models/inbox_member_spec.rb
@@ -18,4 +18,30 @@ RSpec.describe InboxMember do
end
end
end
+
+ describe 'unread filter count invalidation' do
+ let(:account) { create(:account) }
+ let(:inbox) { create(:inbox, account: account) }
+ let(:user) { create(:user, account: account, role: :agent) }
+ let(:notifier) { instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true) }
+
+ before do
+ allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
+ end
+
+ it 'notifies when inbox access is added' do
+ create(:inbox_member, inbox: inbox, user: user)
+
+ expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(account: account, user: user)
+ expect(notifier).to have_received(:perform)
+ end
+
+ it 'notifies when inbox access is removed' do
+ inbox_member = create(:inbox_member, inbox: inbox, user: user)
+ expect(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).with(account: account, user: user).and_return(notifier)
+ expect(notifier).to receive(:perform)
+
+ inbox_member.destroy!
+ end
+ end
end
diff --git a/spec/services/conversations/unread_counts/builder_spec.rb b/spec/services/conversations/unread_counts/builder_spec.rb
index 4b3aec230..fe1bdb6fa 100644
--- a/spec/services/conversations/unread_counts/builder_spec.rb
+++ b/spec/services/conversations/unread_counts/builder_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Conversations::UnreadCounts::Builder do
let(:store) { Conversations::UnreadCounts::Store }
after do
- store.clear_account!(account.id)
+ store.clear_all_account!(account.id)
end
describe '#build_base!' do
@@ -75,6 +75,173 @@ RSpec.describe Conversations::UnreadCounts::Builder do
end
end
+ describe '#build_filters_for!' do
+ before do
+ create(:inbox_member, user: assignee, inbox: inbox)
+ end
+
+ it 'stores unread open conversations by mentions and participating dimensions' do
+ mentioned_conversation = create_unread_conversation(account: account, inbox: inbox)
+ participating_conversation = create_unread_conversation(account: account, inbox: inbox)
+ resolved_mentioned_conversation = create_unread_conversation(account: account, inbox: inbox)
+ inaccessible_conversation = create_unread_conversation(account: account, inbox: create(:inbox, account: account))
+ resolved_mentioned_conversation.update!(status: :resolved)
+
+ create(:mention, account: account, conversation: mentioned_conversation, user: assignee)
+ create(:mention, account: account, conversation: resolved_mentioned_conversation, user: assignee)
+ create(:mention, account: account, conversation: inaccessible_conversation, user: assignee)
+ create(:conversation_participant, account: account, conversation: participating_conversation, user: assignee)
+
+ described_class.new(account).build_filters_for!(assignee)
+
+ expect(store.filters_ready?(account.id, assignee.id)).to be(true)
+ expect(redis_set_members(store.user_mentions_key(account.id, assignee.id))).to contain_exactly(mentioned_conversation.id.to_s)
+ expect(redis_set_members(store.user_participating_key(account.id, assignee.id))).to contain_exactly(participating_conversation.id.to_s)
+ end
+
+ it 'excludes participating conversations that are no longer visible to the user' do
+ participating_conversation = create_unread_conversation(account: account, inbox: inbox)
+ create(:conversation_participant, account: account, conversation: participating_conversation, user: assignee)
+ InboxMember.find_by!(user: assignee, inbox: inbox).destroy!
+
+ described_class.new(account).build_filters_for!(assignee)
+
+ expect(redis_set_members(store.user_participating_key(account.id, assignee.id))).to be_empty
+ end
+
+ it 'stores visible unread open unattended conversations' do
+ no_first_reply_conversation = create_unread_conversation(account: account, inbox: inbox)
+ waiting_conversation = create_unread_conversation(account: account, inbox: inbox)
+ attended_conversation = create_unread_conversation(account: account, inbox: inbox)
+ inaccessible_conversation = create_unread_conversation(account: account, inbox: create(:inbox, account: account))
+ resolved_conversation = create_unread_conversation(account: account, inbox: inbox)
+ create_read_conversation
+
+ waiting_conversation.update!(first_reply_created_at: 5.minutes.ago)
+ attended_conversation.update!(first_reply_created_at: 5.minutes.ago, waiting_since: nil)
+ inaccessible_conversation.update!(first_reply_created_at: nil)
+ resolved_conversation.update!(status: :resolved)
+
+ described_class.new(account).build_filters_for!(assignee)
+
+ expect(redis_set_members(store.user_unattended_key(account.id, assignee.id))).to contain_exactly(
+ no_first_reply_conversation.id.to_s,
+ waiting_conversation.id.to_s
+ )
+ end
+
+ it 'stores folder memberships using the saved filter status conditions' do
+ resolved_conversation = create_unread_conversation(account: account, inbox: inbox)
+ resolved_conversation.update!(status: :resolved)
+ create_unread_conversation(account: account, inbox: inbox, assignee: assignee)
+ custom_filter = create(
+ :custom_filter, account: account, user: assignee, filter_type: :conversation, query: filter_query('status', ['resolved'])
+ )
+
+ described_class.new(account).build_filters_for!(assignee)
+
+ expect(redis_set_members(store.user_folder_key(account.id, assignee.id, custom_filter.id))).to contain_exactly(resolved_conversation.id.to_s)
+ end
+
+ it 'loads folder filters after taking the invalidation version snapshot' do
+ create_unread_conversation(account: account, inbox: inbox)
+ resolved_conversation = create_unread_conversation(account: account, inbox: inbox)
+ resolved_conversation.update!(status: :resolved)
+ custom_filter = create(
+ :custom_filter, account: account, user: assignee, filter_type: :conversation, query: filter_query('status', ['open'])
+ )
+ notifier = instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true)
+ allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
+ filter_updated = false
+ allow(store).to receive(:filter_version_snapshot).and_wrap_original do |method, *args|
+ method.call(*args).tap do
+ next if filter_updated
+
+ filter_updated = true
+ custom_filter.update!(query: filter_query('status', ['resolved']))
+ end
+ end
+
+ described_class.new(account).build_filters_for!(assignee)
+
+ expect(redis_set_members(store.user_folder_key(account.id, assignee.id, custom_filter.id))).to contain_exactly(resolved_conversation.id.to_s)
+ end
+
+ it 'expires relative-date folder caches at the next date boundary' do
+ create(
+ :custom_filter,
+ account: account,
+ user: assignee,
+ filter_type: :conversation,
+ query: filter_query('created_at', [7], filter_operator: 'days_before')
+ )
+ allow(store).to receive(:mark_filters_ready_if_current!).and_call_original
+ expected_ttl = nil
+
+ travel_to Time.zone.local(2026, 1, 1, 9, 30, 0) do
+ expected_ttl = (Time.zone.tomorrow.beginning_of_day - Time.current).ceil
+ described_class.new(account).build_filters_for!(assignee)
+ end
+
+ expect(store).to have_received(:mark_filters_ready_if_current!).with(
+ account.id,
+ assignee.id,
+ version_snapshot: kind_of(Hash),
+ expires_in: expected_ttl
+ )
+ end
+
+ it 'does not mark filters ready when user filters are invalidated during the build' do
+ conversation = create_unread_conversation(account: account, inbox: inbox)
+ create(:mention, account: account, conversation: conversation, user: assignee)
+ clear_user_filters_after_membership_write
+
+ described_class.new(account).build_filters_for!(assignee)
+
+ expect(store.filters_ready?(account.id, assignee.id)).to be(false)
+ expect(redis_set_members(store.user_mentions_key(account.id, assignee.id))).to be_empty
+ end
+
+ it 'does not mark filters ready when account filters are invalidated during the build' do
+ conversation = create_unread_conversation(account: account, inbox: inbox)
+ create(:mention, account: account, conversation: conversation, user: assignee)
+ clear_filter_caches_after_membership_write
+
+ described_class.new(account).build_filters_for!(assignee)
+
+ expect(store.filters_ready?(account.id, assignee.id)).to be(false)
+ expect(redis_set_members(store.user_mentions_key(account.id, assignee.id))).to be_empty
+ end
+
+ it 'skips invalid folder filters and still marks the user filter cache ready' do
+ create_unread_conversation(account: account, inbox: inbox)
+ invalid_filter = create(
+ :custom_filter, account: account, user: assignee, filter_type: :conversation, query: filter_query('missing_attribute', ['open'])
+ )
+
+ described_class.new(account).build_filters_for!(assignee)
+
+ expect(store.filters_ready?(account.id, assignee.id)).to be(true)
+ expect(redis_set_members(store.user_folder_key(account.id, assignee.id, invalid_filter.id))).to be_empty
+ end
+
+ it 'skips folder filters that fail when the SQL query is executed' do
+ conversation = create_unread_conversation(account: account, inbox: inbox)
+ invalid_filter = create(
+ :custom_filter,
+ account: account,
+ user: assignee,
+ filter_type: :conversation,
+ query: filter_query('display_id', [conversation.display_id.to_s], filter_operator: 'contains')
+ )
+
+ expect { described_class.new(account).build_filters_for!(assignee) }.not_to raise_error
+
+ expect(store.filters_ready?(account.id, assignee.id)).to be(true)
+ expect(redis_set_members(store.user_folder_key(account.id, assignee.id, invalid_filter.id))).to be_empty
+ end
+ end
+
def create_read_conversation
conversation = create(:conversation, account: account, inbox: inbox, agent_last_seen_at: 1.minute.from_now)
create(:message, account: account, inbox: inbox, conversation: conversation, message_type: :incoming)
@@ -90,4 +257,32 @@ RSpec.describe Conversations::UnreadCounts::Builder do
def redis_set_members(key)
Redis::Alfred.pipelined { |pipeline| pipeline.smembers(key) }.first
end
+
+ def clear_user_filters_after_membership_write
+ allow(store).to receive(:add_filter_memberships).and_wrap_original do |method, *args, **kwargs|
+ method.call(*args, **kwargs)
+ store.clear_user_filters!(account.id, assignee.id)
+ end
+ end
+
+ def clear_filter_caches_after_membership_write
+ allow(store).to receive(:add_filter_memberships).and_wrap_original do |method, *args, **kwargs|
+ method.call(*args, **kwargs)
+ store.clear_filter_caches!(account.id)
+ end
+ end
+
+ def filter_query(attribute_key, values, filter_operator: 'equal_to')
+ {
+ payload: [
+ {
+ attribute_key: attribute_key,
+ filter_operator: filter_operator,
+ values: values,
+ query_operator: nil,
+ custom_attribute_type: ''
+ }
+ ]
+ }
+ end
end
diff --git a/spec/services/conversations/unread_counts/counter_spec.rb b/spec/services/conversations/unread_counts/counter_spec.rb
index 723f2d437..c3c338355 100644
--- a/spec/services/conversations/unread_counts/counter_spec.rb
+++ b/spec/services/conversations/unread_counts/counter_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Conversations::UnreadCounts::Counter do
end
after do
- store.clear_account!(account.id)
+ store.clear_all_account!(account.id)
end
it 'builds the base cache on demand' do
@@ -32,6 +32,7 @@ RSpec.describe Conversations::UnreadCounts::Counter do
lock_key = "UNREAD_CONVERSATIONS::V1::ACCOUNT::#{account.id}::BUILD_LOCK::BASE"
lock_manager = instance_double(Redis::LockManager)
allow(Redis::LockManager).to receive(:new).and_return(lock_manager)
+ allow(lock_manager).to receive(:with_lock).and_yield.and_return(true)
allow(lock_manager).to receive(:with_lock).with(lock_key, described_class::BUILD_LOCK_TTL).and_yield.and_return(true)
create_unread_conversation(account: account, inbox: visible_inbox, labels: [label.title], team: visible_team)
@@ -46,13 +47,33 @@ RSpec.describe Conversations::UnreadCounts::Counter do
counter = described_class.new(account: account, user: agent)
allow(Redis::LockManager).to receive(:new).and_return(lock_manager)
- allow(counter).to receive(:wait_for_cache_ready) { store.mark_base_ready!(account.id) }
+ allow(counter).to receive(:wait_for_cache_ready) do
+ store.mark_base_ready!(account.id)
+ store.mark_filters_ready!(account.id, agent.id)
+ end
expect(Conversations::UnreadCounts::Builder).not_to receive(:new)
counter.perform
expect(counter).to have_received(:wait_for_cache_ready)
expect(store.base_ready?(account.id)).to be(true)
+ expect(store.filters_ready?(account.id, agent.id)).to be(true)
+ end
+
+ it 'retries when a build finishes without marking the cache ready' do
+ builder = instance_double(Conversations::UnreadCounts::Builder)
+ attempts = 0
+ allow(Conversations::UnreadCounts::Builder).to receive(:new).and_return(builder)
+ allow(builder).to receive(:build_base!) do
+ attempts += 1
+ store.mark_base_ready!(account.id) if attempts == 2
+ end
+ allow(builder).to receive(:build_filters_for!) { store.mark_filters_ready!(account.id, agent.id) }
+
+ described_class.new(account: account, user: agent).perform
+
+ expect(builder).to have_received(:build_base!).twice
+ expect(store.base_ready?(account.id)).to be(true)
end
it 'counts unread conversations only across inboxes visible to a normal agent' do
@@ -65,7 +86,11 @@ RSpec.describe Conversations::UnreadCounts::Counter do
all_count: 1,
inboxes: { visible_inbox.id.to_s => 1 },
labels: { label.id.to_s => 1 },
- teams: { visible_team.id.to_s => 1 }
+ teams: { visible_team.id.to_s => 1 },
+ mentions_count: 0,
+ participating_count: 0,
+ unattended_count: 1,
+ folders: {}
)
end
@@ -79,7 +104,11 @@ RSpec.describe Conversations::UnreadCounts::Counter do
all_count: 2,
inboxes: { visible_inbox.id.to_s => 1, hidden_inbox.id.to_s => 1 },
labels: { label.id.to_s => 2 },
- teams: { visible_team.id.to_s => 2 }
+ teams: { visible_team.id.to_s => 2 },
+ mentions_count: 0,
+ participating_count: 0,
+ unattended_count: 2,
+ folders: {}
)
end
@@ -92,7 +121,46 @@ RSpec.describe Conversations::UnreadCounts::Counter do
all_count: 1,
inboxes: { visible_inbox.id.to_s => 1 },
labels: {},
- teams: { visible_team.id.to_s => 1 }
+ teams: { visible_team.id.to_s => 1 },
+ mentions_count: 0,
+ participating_count: 0,
+ unattended_count: 1,
+ folders: {}
)
end
+
+ it 'returns mention, participating, unattended, and valid folder unread counts for the user' do
+ mentioned_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
+ participating_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
+ resolved_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
+ resolved_conversation.update!(status: :resolved)
+ valid_folder = create(:custom_filter, account: account, user: agent, filter_type: :conversation, query: filter_query('status', ['resolved']))
+ invalid_folder = create(:custom_filter, account: account, user: agent, filter_type: :conversation, query: filter_query('unknown', ['open']))
+
+ create(:mention, account: account, conversation: mentioned_conversation, user: agent)
+ create(:conversation_participant, account: account, conversation: participating_conversation, user: agent)
+
+ result = described_class.new(account: account, user: agent).perform
+
+ expect(result[:mentions_count]).to eq(1)
+ expect(result[:participating_count]).to eq(1)
+ expect(result[:unattended_count]).to eq(2)
+ expect(result[:folders]).to eq(valid_folder.id.to_s => 1)
+ expect(result[:folders]).not_to have_key(invalid_folder.id.to_s)
+ expect(store.filters_ready?(account.id, agent.id)).to be(true)
+ end
+
+ def filter_query(attribute_key, values)
+ {
+ payload: [
+ {
+ attribute_key: attribute_key,
+ filter_operator: 'equal_to',
+ values: values,
+ query_operator: nil,
+ custom_attribute_type: ''
+ }
+ ]
+ }
+ end
end
diff --git a/spec/services/conversations/unread_counts/listener_spec.rb b/spec/services/conversations/unread_counts/listener_spec.rb
index fbb0a0835..0cf31bd3c 100644
--- a/spec/services/conversations/unread_counts/listener_spec.rb
+++ b/spec/services/conversations/unread_counts/listener_spec.rb
@@ -21,13 +21,22 @@ RSpec.describe Conversations::UnreadCounts::Listener do
expect(notifier).to have_received(:perform)
end
- it 'ignores outgoing message creation' do
+ it 'clears user filter counts when a non-incoming message updates last activity' do
+ account.enable_features!(:conversation_unread_counts)
message = create(:message, account: account, inbox: conversation.inbox, conversation: conversation, message_type: :outgoing)
event = Events::Base.new('message.created', Time.zone.now, message: message)
+ allow(store).to receive(:clear_filter_caches!).and_return(true)
+ allow(Rails.configuration.dispatcher).to receive(:dispatch)
listener.message_created(event)
expect(Conversations::UnreadCounts::Notifier).not_to have_received(:new)
+ expect(store).to have_received(:clear_filter_caches!).with(account.id)
+ expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
+ 'conversation.unread_count_changed',
+ kind_of(Time),
+ conversation: conversation
+ )
end
it 'ignores incoming message creation when conversation unread counts are disabled' do
@@ -52,6 +61,7 @@ RSpec.describe Conversations::UnreadCounts::Listener do
end
it 'refreshes unread counts when labels change' do
+ account.enable_features!(:conversation_unread_counts)
changed_attributes = { label_list: [%w[old], %w[new]] }
event = Events::Base.new('conversation.updated', Time.zone.now, conversation: conversation, changed_attributes: changed_attributes)
@@ -61,8 +71,43 @@ RSpec.describe Conversations::UnreadCounts::Listener do
expect(notifier).to have_received(:perform)
end
- it 'ignores conversation updates unrelated to unread count dimensions' do
+ it 'clears user filter counts when a folder filter dimension changes' do
+ account.enable_features!(:conversation_unread_counts)
event = Events::Base.new('conversation.updated', Time.zone.now, conversation: conversation, changed_attributes: { priority: [nil, 'high'] })
+ allow(store).to receive(:clear_filter_caches!).and_return(true)
+ allow(Rails.configuration.dispatcher).to receive(:dispatch)
+
+ listener.conversation_updated(event)
+
+ expect(Conversations::UnreadCounts::Notifier).not_to have_received(:new)
+ expect(store).to have_received(:clear_filter_caches!).with(account.id)
+ expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
+ 'conversation.unread_count_changed',
+ kind_of(Time),
+ conversation: conversation
+ )
+ end
+
+ it 'clears user filter counts when the conversation contact changes' do
+ account.enable_features!(:conversation_unread_counts)
+ event = Events::Base.new('conversation.contact_changed', Time.zone.now, conversation: conversation)
+ allow(store).to receive(:clear_filter_caches!).and_return(true)
+ allow(Rails.configuration.dispatcher).to receive(:dispatch)
+
+ listener.conversation_contact_changed(event)
+
+ expect(Conversations::UnreadCounts::Notifier).not_to have_received(:new)
+ expect(store).to have_received(:clear_filter_caches!).with(account.id)
+ expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
+ 'conversation.unread_count_changed',
+ kind_of(Time),
+ conversation: conversation
+ )
+ end
+
+ it 'ignores conversation updates without changed attributes' do
+ account.enable_features!(:conversation_unread_counts)
+ event = Events::Base.new('conversation.updated', Time.zone.now, conversation: conversation, changed_attributes: {})
listener.conversation_updated(event)
@@ -128,7 +173,7 @@ RSpec.describe Conversations::UnreadCounts::Listener do
conversation_data: conversation_data.stringify_keys
)
ensure
- store.clear_account!(account.id)
+ store.clear_all_account!(account.id)
end
def deleted_conversation_data(conversation)
diff --git a/spec/services/conversations/unread_counts/notifier_spec.rb b/spec/services/conversations/unread_counts/notifier_spec.rb
index 1b35d37f6..645c2bc17 100644
--- a/spec/services/conversations/unread_counts/notifier_spec.rb
+++ b/spec/services/conversations/unread_counts/notifier_spec.rb
@@ -29,6 +29,18 @@ RSpec.describe Conversations::UnreadCounts::Notifier do
expect(Rails.configuration.dispatcher).not_to have_received(:dispatch)
end
+
+ it 'dispatches unread count changed event when user filter caches were cleared' do
+ allow(Conversations::UnreadCounts::Store).to receive(:clear_filter_caches!).and_return(true)
+
+ described_class.new(conversation).perform
+
+ expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
+ 'conversation.unread_count_changed',
+ kind_of(Time),
+ conversation: conversation
+ )
+ end
end
context 'when conversation unread counts feature is disabled' do
diff --git a/spec/services/conversations/unread_counts/refresher_spec.rb b/spec/services/conversations/unread_counts/refresher_spec.rb
index 5f361e7aa..e961c21c3 100644
--- a/spec/services/conversations/unread_counts/refresher_spec.rb
+++ b/spec/services/conversations/unread_counts/refresher_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Conversations::UnreadCounts::Refresher do
let(:store) { Conversations::UnreadCounts::Store }
after do
- store.clear_account!(account.id)
+ store.clear_all_account!(account.id)
end
it 'does not update redis when unread caches are not ready' do
diff --git a/spec/services/conversations/unread_counts/store_spec.rb b/spec/services/conversations/unread_counts/store_spec.rb
index fcf21c985..9e1311727 100644
--- a/spec/services/conversations/unread_counts/store_spec.rb
+++ b/spec/services/conversations/unread_counts/store_spec.rb
@@ -7,9 +7,10 @@ RSpec.describe Conversations::UnreadCounts::Store do
let(:user_id) { 4 }
let(:conversation_id) { 5 }
let(:team_id) { 6 }
+ let(:other_user_id) { 8 }
after do
- described_class.clear_account!(account_id)
+ described_class.clear_all_account!(account_id)
end
describe 'key builders' do
@@ -45,20 +46,69 @@ RSpec.describe Conversations::UnreadCounts::Store do
'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::TEAM::6::INBOX::2::ASSIGNEE::4'
)
end
+
+ it 'builds user filter keys using the Redis key naming convention' do
+ expect(described_class.user_mentions_key(account_id, user_id)).to eq(
+ 'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::MENTIONS'
+ )
+ expect(described_class.user_participating_key(account_id, user_id)).to eq(
+ 'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::PARTICIPATING'
+ )
+ expect(described_class.user_unattended_key(account_id, user_id)).to eq(
+ 'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::UNATTENDED'
+ )
+ expect(described_class.user_folder_key(account_id, user_id, 7)).to eq(
+ 'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::FOLDER::7'
+ )
+ end
end
describe 'ready markers' do
- it 'tracks base and assignment readiness independently' do
+ it 'starts with all ready markers missing' do
expect(described_class.base_ready?(account_id)).to be(false)
expect(described_class.assignment_ready?(account_id)).to be(false)
+ expect(described_class.filters_ready?(account_id, user_id)).to be(false)
+ end
+ it 'tracks base, assignment, and user filter readiness independently' do
described_class.mark_base_ready!(account_id)
described_class.mark_assignment_ready!(account_id)
+ described_class.mark_filters_ready!(account_id, user_id)
expect(described_class.base_ready?(account_id)).to be(true)
expect(described_class.assignment_ready?(account_id)).to be(true)
+ expect(described_class.filters_ready?(account_id, user_id)).to be(true)
expect(ttl_for('UNREAD_CONVERSATIONS::V1::ACCOUNT::1::READY::BASE')).to be_within(5).of(Conversations::UnreadCounts::READY_TTL)
expect(ttl_for('UNREAD_CONVERSATIONS::V1::ACCOUNT::1::READY::ASSIGNMENT')).to be_within(5).of(Conversations::UnreadCounts::READY_TTL)
+ expect(ttl_for('UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::READY::FILTERS')).to be_within(5).of(
+ Conversations::UnreadCounts::READY_TTL
+ )
+ end
+
+ it 'tracks filter invalidation versions independently' do
+ expect(described_class.filter_version_snapshot(account_id, user_id)).to eq(account: 0, user: 0)
+
+ expect(described_class.clear_user_filters!(account_id, user_id)).to be(false)
+
+ expect(described_class.filter_version_snapshot(account_id, user_id)).to eq(account: 0, user: 1)
+ expect(ttl_for(user_filter_version_key)).to be_within(5).of(Conversations::UnreadCounts::SET_TTL)
+
+ expect(described_class.clear_filter_caches!(account_id)).to be(false)
+
+ expect(described_class.filter_version_snapshot(account_id, user_id)).to eq(account: 1, user: 1)
+ expect(ttl_for(account_filter_version_key)).to be_within(5).of(Conversations::UnreadCounts::SET_TTL)
+ end
+
+ it 'marks filter caches ready only when the invalidation version is current' do
+ version_snapshot = described_class.filter_version_snapshot(account_id, user_id)
+
+ expect(described_class.mark_filters_ready_if_current!(account_id, user_id, version_snapshot: version_snapshot)).to be_truthy
+ expect(described_class.filters_ready?(account_id, user_id)).to be(true)
+
+ described_class.clear_user_filters!(account_id, user_id)
+
+ expect(described_class.mark_filters_ready_if_current!(account_id, user_id, version_snapshot: version_snapshot)).to be(false)
+ expect(described_class.filters_ready?(account_id, user_id)).to be(false)
end
end
@@ -150,9 +200,94 @@ RSpec.describe Conversations::UnreadCounts::Store do
expect(base_keys.map { |key| ttl_for(key) }).to all(be_within(5).of(Conversations::UnreadCounts::SET_TTL))
end
- it 'clears all account memberships' do
+ it 'adds, counts, and clears user filter memberships' do
+ described_class.add_filter_memberships(
+ account_id: account_id,
+ user_id: user_id,
+ filters: {
+ mentions: [conversation_id],
+ participating: [conversation_id],
+ unattended: [conversation_id]
+ },
+ folders: { 7 => [conversation_id] }
+ )
+ described_class.mark_filters_ready!(account_id, user_id)
+
+ expect(described_class.counts_for_keys(user_filter_keys)).to eq(
+ described_class.user_mentions_key(account_id, user_id) => 1,
+ described_class.user_participating_key(account_id, user_id) => 1,
+ described_class.user_unattended_key(account_id, user_id) => 1,
+ described_class.user_folder_key(account_id, user_id, 7) => 1
+ )
+ expect(user_filter_keys.map { |key| ttl_for(key) }).to all(be_within(5).of(Conversations::UnreadCounts::SET_TTL))
+
+ expect(described_class.clear_user_filters!(account_id, user_id)).to be(true)
+
+ expect(described_class.filters_ready?(account_id, user_id)).to be(false)
+ expect(described_class.counts_for_keys(user_filter_keys).values).to all(eq(0))
+ end
+
+ it 'preserves the user filter build lock when clearing one user filter cache' do
+ described_class.add_filter_memberships(
+ account_id: account_id,
+ user_id: user_id,
+ filters: {
+ mentions: [conversation_id],
+ participating: [conversation_id],
+ unattended: [conversation_id]
+ },
+ folders: { 7 => [conversation_id] }
+ )
+ described_class.mark_filters_ready!(account_id, user_id)
+ Redis::Alfred.set(user_filter_build_lock_key, 'locked')
+
+ expect(described_class.clear_user_filters!(account_id, user_id)).to be(true)
+
+ expect(Redis::Alfred.exists?(user_filter_build_lock_key)).to be(true)
+ expect(described_class.filters_ready?(account_id, user_id)).to be(false)
+ expect(described_class.counts_for_keys(user_filter_keys).values).to all(eq(0))
+ end
+
+ it 'preserves user filter build locks when clearing all account filter caches' do
+ described_class.add_filter_memberships(
+ account_id: account_id,
+ user_id: user_id,
+ filters: {
+ mentions: [conversation_id],
+ participating: [],
+ unattended: []
+ },
+ folders: {}
+ )
+ described_class.add_filter_memberships(
+ account_id: account_id,
+ user_id: other_user_id,
+ filters: {
+ mentions: [conversation_id],
+ participating: [],
+ unattended: []
+ },
+ folders: {}
+ )
+ described_class.mark_filters_ready!(account_id, user_id)
+ described_class.mark_filters_ready!(account_id, other_user_id)
+ Redis::Alfred.set(user_filter_build_lock_key, 'locked')
+ Redis::Alfred.set(user_filter_build_lock_key(other_user_id), 'locked')
+
+ expect(described_class.clear_filter_caches!(account_id)).to be(true)
+
+ expect(Redis::Alfred.exists?(user_filter_build_lock_key)).to be(true)
+ expect(Redis::Alfred.exists?(user_filter_build_lock_key(other_user_id))).to be(true)
+ expect(described_class.filters_ready?(account_id, user_id)).to be(false)
+ expect(described_class.filters_ready?(account_id, other_user_id)).to be(false)
+ expect(described_class.counts_for_keys([described_class.user_mentions_key(account_id, user_id)]).values).to all(eq(0))
+ expect(described_class.counts_for_keys([described_class.user_mentions_key(account_id, other_user_id)]).values).to all(eq(0))
+ end
+
+ it 'clears account memberships without clearing user filter memberships' do
described_class.mark_base_ready!(account_id)
described_class.mark_assignment_ready!(account_id)
+ described_class.mark_filters_ready!(account_id, user_id)
described_class.add_base_membership(
account_id: account_id,
inbox_id: inbox_id,
@@ -168,13 +303,69 @@ RSpec.describe Conversations::UnreadCounts::Store do
team_id: team_id,
conversation_id: conversation_id
)
+ described_class.add_filter_memberships(
+ account_id: account_id,
+ user_id: user_id,
+ filters: {
+ mentions: [conversation_id],
+ participating: [],
+ unattended: []
+ },
+ folders: {}
+ )
+ Redis::Alfred.set(user_filter_build_lock_key, 'locked')
described_class.clear_account!(account_id)
expect(described_class.base_ready?(account_id)).to be(false)
expect(described_class.assignment_ready?(account_id)).to be(false)
+ expect(described_class.filters_ready?(account_id, user_id)).to be(true)
expect(described_class.counts_for_keys(base_keys).values).to all(eq(0))
expect(described_class.counts_for_keys(assignment_keys).values).to all(eq(0))
+ expect(described_class.counts_for_keys([described_class.user_mentions_key(account_id, user_id)]).values).to all(eq(1))
+ expect(Redis::Alfred.exists?(user_filter_build_lock_key)).to be(true)
+ end
+
+ it 'clears all account unread count keys' do
+ described_class.mark_base_ready!(account_id)
+ described_class.mark_assignment_ready!(account_id)
+ described_class.mark_filters_ready!(account_id, user_id)
+ described_class.add_base_membership(
+ account_id: account_id,
+ inbox_id: inbox_id,
+ label_ids: [label_id],
+ team_id: team_id,
+ conversation_id: conversation_id
+ )
+ described_class.add_assignment_membership(
+ account_id: account_id,
+ inbox_id: inbox_id,
+ label_ids: [label_id],
+ assignee_id: user_id,
+ team_id: team_id,
+ conversation_id: conversation_id
+ )
+ described_class.add_filter_memberships(
+ account_id: account_id,
+ user_id: user_id,
+ filters: {
+ mentions: [conversation_id],
+ participating: [],
+ unattended: []
+ },
+ folders: {}
+ )
+ Redis::Alfred.set(user_filter_build_lock_key, 'locked')
+
+ described_class.clear_all_account!(account_id)
+
+ expect(described_class.base_ready?(account_id)).to be(false)
+ expect(described_class.assignment_ready?(account_id)).to be(false)
+ expect(described_class.filters_ready?(account_id, user_id)).to be(false)
+ expect(described_class.counts_for_keys(base_keys).values).to all(eq(0))
+ expect(described_class.counts_for_keys(assignment_keys).values).to all(eq(0))
+ expect(described_class.counts_for_keys([described_class.user_mentions_key(account_id, user_id)]).values).to all(eq(0))
+ expect(Redis::Alfred.exists?(user_filter_build_lock_key)).to be(false)
end
end
@@ -194,6 +385,27 @@ RSpec.describe Conversations::UnreadCounts::Store do
]
end
+ def user_filter_keys(filter_user_id = user_id)
+ [
+ described_class.user_mentions_key(account_id, filter_user_id),
+ described_class.user_participating_key(account_id, filter_user_id),
+ described_class.user_unattended_key(account_id, filter_user_id),
+ described_class.user_folder_key(account_id, filter_user_id, 7)
+ ]
+ end
+
+ def user_filter_build_lock_key(filter_user_id = user_id)
+ format(Redis::Alfred::UNREAD_CONVERSATIONS_USER_FILTERS_BUILD_LOCK, account_id: account_id, user_id: filter_user_id)
+ end
+
+ def account_filter_version_key
+ format(Redis::Alfred::UNREAD_CONVERSATIONS_FILTERS_VERSION, account_id: account_id)
+ end
+
+ def user_filter_version_key(filter_user_id = user_id)
+ format(Redis::Alfred::UNREAD_CONVERSATIONS_USER_FILTERS_VERSION, account_id: account_id, user_id: filter_user_id)
+ end
+
def ttl_for(key)
Redis::Alfred.ttl(key)
end
diff --git a/spec/services/conversations/unread_counts/user_filter_notifier_spec.rb b/spec/services/conversations/unread_counts/user_filter_notifier_spec.rb
new file mode 100644
index 000000000..1d898b103
--- /dev/null
+++ b/spec/services/conversations/unread_counts/user_filter_notifier_spec.rb
@@ -0,0 +1,37 @@
+require 'rails_helper'
+
+RSpec.describe Conversations::UnreadCounts::UserFilterNotifier do
+ let(:account) { create(:account) }
+ let(:user) { create(:user, account: account) }
+ let(:store) { Conversations::UnreadCounts::Store }
+
+ after do
+ store.clear_all_account!(account.id)
+ end
+
+ it 'clears the user filter cache and dispatches an unread count refresh event' do
+ account.enable_features!(:conversation_unread_counts)
+ store.mark_filters_ready!(account.id, user.id)
+ allow(Rails.configuration.dispatcher).to receive(:dispatch)
+
+ described_class.new(account: account, user: user).perform
+
+ expect(store.filters_ready?(account.id, user.id)).to be(false)
+ expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
+ 'conversation.unread_count_changed',
+ kind_of(Time),
+ account: account,
+ user: user
+ )
+ end
+
+ it 'does nothing when conversation unread counts are disabled' do
+ store.mark_filters_ready!(account.id, user.id)
+ allow(Rails.configuration.dispatcher).to receive(:dispatch)
+
+ described_class.new(account: account, user: user).perform
+
+ expect(store.filters_ready?(account.id, user.id)).to be(true)
+ expect(Rails.configuration.dispatcher).not_to have_received(:dispatch)
+ end
+end
From c70a57407d4722e878beeccc9ad756fbb2d75810 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan
Date: Wed, 17 Jun 2026 00:05:29 +0530
Subject: [PATCH 17/26] fix: label Chatwoot Mobile sessions instead of 'Unknown
Device' (#14753)
## Description
Sessions created by logins from the Chatwoot Mobile app currently render
as "Unknown Device" in the dashboard sessions UI. The mobile app's HTTP
layer sends:
- Android: `User-Agent: okhttp/4.9.2`
- iOS: `User-Agent: Chatwoot/ CFNetwork/ Darwin/`
Neither pattern is classifiable by the `browser` gem, so
\`browser_name\`, \`platform_name\`, and \`device_name\` all end up
"Unknown".
This change adds a backend-only fallback in
\`UserSessionTrackingService\`. When \`Browser.new(ua)\` returns
"Unknown Browser" and the UA matches a known Chatwoot Mobile pattern,
the labels are overridden to \`Chatwoot Mobile\` + \`Android\` /
\`iPhone\`. The Vue sessions list (\`ActiveSessions.vue\`) then renders
"Chatwoot Mobile on Android" or "Chatwoot Mobile on iPhone" with the
smartphone icon.
This is the immediate floor. A follow-up will add structured
\`X-Chatwoot-*\` headers from the mobile app so we can render full
version + device model.
Fixes INF-75.
## Type of change
- [x] Bug fix (non-breaking change which fixes an issue)
## How Has This Been Tested?
- Added specs
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [x] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [x] Any dependent changes have been merged and published in downstream
modules
---
app/services/user_session_tracking_service.rb | 26 ++++++-
.../user_session_tracking_service_spec.rb | 69 +++++++++++++++++++
2 files changed, 94 insertions(+), 1 deletion(-)
diff --git a/app/services/user_session_tracking_service.rb b/app/services/user_session_tracking_service.rb
index 28f272a18..d7e6f6efb 100644
--- a/app/services/user_session_tracking_service.rb
+++ b/app/services/user_session_tracking_service.rb
@@ -1,4 +1,11 @@
class UserSessionTrackingService
+ # CFNetwork UAs cannot distinguish iPhone from iPad; both get labelled iPhone here.
+ LEGACY_MOBILE_UAS = [
+ { match: %r{\Aokhttp/}, platform: 'Android', device: 'Android' },
+ { match: %r{\AChatwoot/.*CFNetwork.*Darwin}, platform: 'iPhone', device: 'iPhone' }
+ ].freeze
+ private_constant :LEGACY_MOBILE_UAS
+
def initialize(user:, request:, client_id:)
@user = user
@request = request
@@ -26,7 +33,7 @@ class UserSessionTrackingService
def session_attributes
browser = Browser.new(@request.user_agent)
- {
+ attrs = {
ip_address: @request.remote_ip,
user_agent: @request.user_agent,
browser_name: browser.name,
@@ -35,5 +42,22 @@ class UserSessionTrackingService
platform_name: browser.platform.name,
platform_version: browser.platform.version
}
+
+ patch_for_legacy_mobile(attrs)
+ end
+
+ def patch_for_legacy_mobile(attrs)
+ return attrs unless attrs[:browser_name] == 'Unknown Browser'
+
+ hit = LEGACY_MOBILE_UAS.find { |m| @request.user_agent.to_s.match?(m[:match]) }
+ return attrs unless hit
+
+ attrs.merge(
+ browser_name: 'Chatwoot Mobile',
+ browser_version: nil,
+ platform_name: hit[:platform],
+ platform_version: nil,
+ device_name: hit[:device]
+ )
end
end
diff --git a/spec/services/user_session_tracking_service_spec.rb b/spec/services/user_session_tracking_service_spec.rb
index 71b6d5924..2b98b95bf 100644
--- a/spec/services/user_session_tracking_service_spec.rb
+++ b/spec/services/user_session_tracking_service_spec.rb
@@ -47,6 +47,75 @@ RSpec.describe UserSessionTrackingService do
expect(existing.reload.ip_address).to eq('8.8.8.8')
expect(existing.last_activity_at).to be_within(1.second).of(Time.current)
end
+
+ context 'with a Chatwoot Mobile legacy User-Agent' do
+ let(:request) do
+ instance_double(
+ ActionDispatch::Request,
+ user_agent: ua,
+ remote_ip: '8.8.8.8'
+ )
+ end
+
+ context 'when the UA is okhttp (Android Chatwoot Mobile)' do
+ let(:ua) { 'okhttp/4.9.2' }
+
+ it 'labels the session as Chatwoot Mobile on Android', :aggregate_failures do
+ service.create_or_update!
+
+ session = user.user_sessions.last
+ expect(session.browser_name).to eq('Chatwoot Mobile')
+ expect(session.browser_version).to be_nil
+ expect(session.platform_name).to eq('Android')
+ expect(session.platform_version).to be_nil
+ expect(session.device_name).to eq('Android')
+ expect(session.user_agent).to eq(ua)
+ end
+ end
+
+ context 'when the UA is CFNetwork (iOS Chatwoot Mobile)' do
+ let(:ua) { 'Chatwoot/3759 CFNetwork/3886.100.1 Darwin/27.0.0' }
+
+ it 'labels the session as Chatwoot Mobile on iPhone', :aggregate_failures do
+ service.create_or_update!
+
+ session = user.user_sessions.last
+ expect(session.browser_name).to eq('Chatwoot Mobile')
+ expect(session.browser_version).to be_nil
+ expect(session.platform_name).to eq('iPhone')
+ expect(session.platform_version).to be_nil
+ expect(session.device_name).to eq('iPhone')
+ expect(session.user_agent).to eq(ua)
+ end
+ end
+
+ context 'when the UA is a real browser (Firefox on Linux)' do
+ let(:ua) { 'Mozilla/5.0 (X11; Linux x86_64; rv:124.0) Gecko/20100101 Firefox/124.0' }
+
+ it 'does not override the Browser-derived metadata', :aggregate_failures do
+ service.create_or_update!
+
+ session = user.user_sessions.last
+ expect(session.browser_name).to eq('Firefox')
+ expect(session.platform_name).to eq('Generic Linux')
+ expect(session.device_name).not_to eq('Android')
+ expect(session.device_name).not_to eq('iPhone')
+ end
+ end
+
+ context 'when the UA is unknown but does not match any mobile pattern' do
+ let(:ua) { 'curl/8.4.0' }
+
+ it 'leaves the Unknown labels untouched', :aggregate_failures do
+ service.create_or_update!
+
+ session = user.user_sessions.last
+ expect(session.browser_name).to eq('Unknown Browser')
+ expect(session.platform_name).to eq('Unknown')
+ expect(session.device_name).to eq('Unknown')
+ end
+ end
+ end
end
describe '#update_activity!' do
From 124782938ddbbca065296d77115bb8d9b2057c69 Mon Sep 17 00:00:00 2001
From: Sony Mathew <2040199+sony-mathew@users.noreply.github.com>
Date: Wed, 17 Jun 2026 00:10:47 +0530
Subject: [PATCH 18/26] Bump version to 4.15.0
---
VERSION_CW | 2 +-
config/app.yml | 2 +-
package.json | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/VERSION_CW b/VERSION_CW
index 0fb7a35b6..5c517bf11 100644
--- a/VERSION_CW
+++ b/VERSION_CW
@@ -1 +1 @@
-4.14.2
+4.15.0
diff --git a/config/app.yml b/config/app.yml
index c2494befa..c2c192018 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
shared: &shared
- version: '4.14.2'
+ version: '4.15.0'
development:
<<: *shared
diff --git a/package.json b/package.json
index fc4598bc4..b8ab60839 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@chatwoot/chatwoot",
- "version": "4.14.2",
+ "version": "4.15.0",
"license": "MIT",
"scripts": {
"eslint": "eslint app/**/*.{js,vue}",
From f66b551c7d6778b7984041832cbba70bc833cde3 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan
Date: Wed, 17 Jun 2026 16:28:48 +0530
Subject: [PATCH 19/26] revert: Sidebar unread counts for filters (CW-7262)
(#14769)
## Description
Reverts [#14726](https://github.com/chatwoot/chatwoot/pull/14726)
(\"feat: Add sidebar unread counts for filters (CW-7262)\"), which
shipped in 4.15.0.
After 4.15.0 rolled out to prod the unread-counts-for-filters code path
caused a cascading incident:
- `Counter#ensure_filters_cache!` fires on every `/unread_counts/index`
and `update_last_seen` request.
- On cache miss it calls `Builder#build_filters_for!`, which:
- invokes `store.clear_user_filters!` -> `delete_matching` -> a Redis
`SCAN_each` over a per-user pattern keyspace, and
- runs 4 fresh SQL passes per user (mentions, participating, unattended,
and per-folder `Conversations::FilterService` queries).
- Threads blocked in the SCAN held their DB connections, the connection
pool exhausted, Sidekiq jobs were discarded with
`ActiveJob::DeserializationError: could not obtain a connection from the
pool`, and the enqueued queue blew past 200K.
Related:
[CW-7262](https://linear.app/chatwoot/issue/CW-7262/unread-counts-for-filters-folders)
## Type of change
- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality not to work as expected)
- [ ] This change requires a documentation update
## How Has This Been Tested?
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [ ] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---
app/finders/conversation_finder.rb | 2 +-
.../components-next/sidebar/ChannelLeaf.vue | 6 +-
.../components-next/sidebar/Sidebar.vue | 38 ---
.../sidebar/SidebarCollapsedPopover.vue | 10 +-
.../sidebar/SidebarGroupLeaf.vue | 5 +-
.../sidebar/SidebarUnreadBadge.vue | 2 -
.../sidebar/specs/ChannelLeaf.spec.js | 12 -
.../sidebar/specs/SidebarGroupLeaf.spec.js | 19 +-
.../dashboard/i18n/locale/en/settings.json | 10 -
.../store/modules/conversationUnreadCounts.js | 23 --
.../conversationUnreadCounts/getters.spec.js | 22 --
.../mutations.spec.js | 19 --
app/listeners/action_cable_listener.rb | 4 +-
app/models/account.rb | 2 +-
app/models/account_user.rb | 9 -
app/models/concerns/cache_keys.rb | 1 +
app/models/conversation_participant.rb | 5 -
app/models/custom_filter.rb | 9 -
app/models/inbox_member.rb | 12 -
app/models/mention.rb | 5 -
app/services/conversations/filter_service.rb | 10 +-
.../unread_counts/broadcast_scope.rb | 14 +-
.../unread_counts/build_lock_keys.rb | 15 --
.../conversations/unread_counts/builder.rb | 139 +----------
.../conversations/unread_counts/counter.rb | 45 ++--
.../unread_counts/filter_counter.rb | 40 ----
.../conversations/unread_counts/listener.rb | 39 +---
.../conversations/unread_counts/notifier.rb | 4 +-
.../conversations/unread_counts/store.rb | 20 +-
.../conversations/unread_counts/store_keys.rb | 16 --
.../unread_counts/user_filter_notifier.rb | 19 --
.../unread_counts/user_filter_store.rb | 100 --------
app/services/filter_service.rb | 12 +-
.../finders/enterprise/conversation_finder.rb | 26 ---
enterprise/app/models/custom_role.rb | 23 --
lib/redis/redis_keys.rb | 15 --
.../accounts/conversations_controller_spec.rb | 43 +---
.../super_admin/accounts_controller_spec.rb | 2 +-
.../finders/conversation_finder_spec.rb | 24 --
spec/enterprise/models/account_user_spec.rb | 18 --
spec/enterprise/models/custom_role_spec.rb | 34 ---
.../unread_counts/counter_spec.rb | 60 ++---
spec/finders/conversation_finder_spec.rb | 19 --
spec/listeners/action_cable_listener_spec.rb | 14 --
spec/models/account_spec.rb | 59 +----
spec/models/account_user_spec.rb | 28 ---
spec/models/inbox_member_spec.rb | 26 ---
.../unread_counts/builder_spec.rb | 197 +---------------
.../unread_counts/counter_spec.rb | 78 +------
.../unread_counts/listener_spec.rb | 51 +---
.../unread_counts/notifier_spec.rb | 12 -
.../unread_counts/refresher_spec.rb | 2 +-
.../conversations/unread_counts/store_spec.rb | 218 +-----------------
.../user_filter_notifier_spec.rb | 37 ---
54 files changed, 95 insertions(+), 1579 deletions(-)
delete mode 100644 app/services/conversations/unread_counts/build_lock_keys.rb
delete mode 100644 app/services/conversations/unread_counts/filter_counter.rb
delete mode 100644 app/services/conversations/unread_counts/user_filter_notifier.rb
delete mode 100644 app/services/conversations/unread_counts/user_filter_store.rb
delete mode 100644 spec/enterprise/finders/conversation_finder_spec.rb
delete mode 100644 spec/services/conversations/unread_counts/user_filter_notifier_spec.rb
diff --git a/app/finders/conversation_finder.rb b/app/finders/conversation_finder.rb
index 9d53ec97e..74bf903f5 100644
--- a/app/finders/conversation_finder.rb
+++ b/app/finders/conversation_finder.rb
@@ -142,7 +142,7 @@ class ConversationFinder
conversation_ids = current_account.mentions.where(user: current_user).pluck(:conversation_id)
@conversations = @conversations.where(id: conversation_ids)
when 'participating'
- @conversations = @conversations.where(id: current_user.participating_conversations.where(account_id: current_account.id).select(:id))
+ @conversations = current_user.participating_conversations.where(account_id: current_account.id)
when 'unattended'
@conversations = @conversations.unattended
end
diff --git a/app/javascript/dashboard/components-next/sidebar/ChannelLeaf.vue b/app/javascript/dashboard/components-next/sidebar/ChannelLeaf.vue
index 234737008..a995cf510 100644
--- a/app/javascript/dashboard/components-next/sidebar/ChannelLeaf.vue
+++ b/app/javascript/dashboard/components-next/sidebar/ChannelLeaf.vue
@@ -22,10 +22,6 @@ const props = defineProps({
type: [Number, String],
default: 0,
},
- badgeTooltip: {
- type: String,
- default: '',
- },
});
const reauthorizationRequired = computed(() => {
@@ -38,7 +34,7 @@ const reauthorizationRequired = computed(() => {
{{ label }}
- d'.freeze
UNREAD_CONVERSATIONS_BASE_READY = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::READY::BASE'.freeze
UNREAD_CONVERSATIONS_ASSIGNMENT_READY = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::READY::ASSIGNMENT'.freeze
- UNREAD_CONVERSATIONS_USER_FILTERS_READY =
- 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::READY::FILTERS'.freeze
- UNREAD_CONVERSATIONS_FILTERS_VERSION = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::VERSION::FILTERS'.freeze
- UNREAD_CONVERSATIONS_USER_FILTERS_VERSION =
- 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::VERSION::FILTERS'.freeze
UNREAD_CONVERSATIONS_BASE_BUILD_LOCK = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::BUILD_LOCK::BASE'.freeze
UNREAD_CONVERSATIONS_ASSIGNMENT_BUILD_LOCK = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::BUILD_LOCK::ASSIGNMENT'.freeze
- UNREAD_CONVERSATIONS_USER_FILTERS_BUILD_LOCK =
- 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::BUILD_LOCK::FILTERS'.freeze
UNREAD_CONVERSATIONS_INBOX = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::INBOX::%d'.freeze
UNREAD_CONVERSATIONS_LABEL_INBOX =
'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::LABEL::%d::INBOX::%d'.freeze
@@ -40,14 +33,6 @@ module Redis::RedisKeys
'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::TEAM::%d::INBOX::%d::UNASSIGNED'.freeze
UNREAD_CONVERSATIONS_TEAM_INBOX_ASSIGNEE =
'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::TEAM::%d::INBOX::%d::ASSIGNEE::%d'.freeze
- UNREAD_CONVERSATIONS_USER_MENTIONS =
- 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::MENTIONS'.freeze
- UNREAD_CONVERSATIONS_USER_PARTICIPATING =
- 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::PARTICIPATING'.freeze
- UNREAD_CONVERSATIONS_USER_UNATTENDED =
- 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::UNATTENDED'.freeze
- UNREAD_CONVERSATIONS_USER_FOLDER =
- 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::FOLDER::%d'.freeze
## User Keys
# SSO Auth Tokens
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index de3cc4a3c..bdb8117ac 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -123,7 +123,7 @@ RSpec.describe 'Conversations API', type: :request do
end
after do
- Conversations::UnreadCounts::Store.clear_all_account!(account.id)
+ Conversations::UnreadCounts::Store.clear_account!(account.id)
end
context 'when conversation unread counts feature is enabled' do
@@ -144,42 +144,7 @@ RSpec.describe 'Conversations API', type: :request do
'all_count' => 1,
'inboxes' => { visible_inbox.id.to_s => 1 },
'labels' => { label.id.to_s => 1 },
- 'teams' => {},
- 'mentions_count' => 0,
- 'participating_count' => 0,
- 'unattended_count' => 1,
- 'folders' => {}
- )
- end
-
- it 'returns unread counts for mentions, participating conversations, unattended conversations, and folders' do
- mentioned_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
- participating_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
- resolved_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
- resolved_conversation.update!(status: :resolved)
- custom_filter = create(:custom_filter, account: account, user: agent, filter_type: :conversation, query: {
- payload: [{
- attribute_key: 'status',
- filter_operator: 'equal_to',
- values: ['resolved'],
- query_operator: nil,
- custom_attribute_type: ''
- }]
- })
-
- create(:mention, account: account, conversation: mentioned_conversation, user: agent)
- create(:conversation_participant, account: account, conversation: participating_conversation, user: agent)
-
- get "/api/v1/accounts/#{account.id}/conversations/unread_counts",
- headers: agent.create_new_auth_token,
- as: :json
-
- expect(response).to have_http_status(:success)
- expect(response.parsed_body['payload']).to include(
- 'mentions_count' => 1,
- 'participating_count' => 1,
- 'unattended_count' => 2,
- 'folders' => { custom_filter.id.to_s => 1 }
+ 'teams' => {}
)
end
@@ -897,7 +862,7 @@ RSpec.describe 'Conversations API', type: :request do
expect(response).to have_http_status(:success)
expect(Conversations::UnreadCounts::Store.counts_for_keys([inbox_key])).to eq(inbox_key => 0)
ensure
- Conversations::UnreadCounts::Store.clear_all_account!(account.id)
+ Conversations::UnreadCounts::Store.clear_account!(account.id)
end
it 'updates both if one timestamp is old even when the other is recent' do
@@ -984,7 +949,7 @@ RSpec.describe 'Conversations API', type: :request do
expect(response).to have_http_status(:success)
expect(Conversations::UnreadCounts::Store.counts_for_keys([inbox_key])).to eq(inbox_key => 1)
ensure
- Conversations::UnreadCounts::Store.clear_all_account!(account.id)
+ Conversations::UnreadCounts::Store.clear_account!(account.id)
end
end
end
diff --git a/spec/controllers/super_admin/accounts_controller_spec.rb b/spec/controllers/super_admin/accounts_controller_spec.rb
index 917499cd5..e4ff81a08 100644
--- a/spec/controllers/super_admin/accounts_controller_spec.rb
+++ b/spec/controllers/super_admin/accounts_controller_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe 'Super Admin accounts API', type: :request do
end
after do
- Conversations::UnreadCounts::Store.clear_all_account!(account.id)
+ Conversations::UnreadCounts::Store.clear_account!(account.id)
end
context 'when it is an unauthenticated user' do
diff --git a/spec/enterprise/finders/conversation_finder_spec.rb b/spec/enterprise/finders/conversation_finder_spec.rb
deleted file mode 100644
index f8b9fce58..000000000
--- a/spec/enterprise/finders/conversation_finder_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe ConversationFinder do
- describe '#perform' do
- it 'returns participant-only conversations for custom roles with participating permission' do
- account = create(:account)
- agent = create(:user, account: account, role: :agent)
- other_agent = create(:user, account: account, role: :agent)
- inbox = create(:inbox, account: account, enable_auto_assignment: false)
- custom_role = create(:custom_role, account: account, permissions: ['conversation_participating_manage'])
- participating_conversation = create(:conversation, account: account, inbox: inbox, assignee: other_agent)
-
- create(:inbox_member, user: agent, inbox: inbox)
- create(:inbox_member, user: other_agent, inbox: inbox)
- create(:conversation_participant, account: account, conversation: participating_conversation, user: agent)
- account.account_users.find_by!(user_id: agent.id).update!(custom_role: custom_role)
- Current.account = account
-
- result = described_class.new(agent, { status: 'open', conversation_type: 'participating' }).perform
-
- expect(result[:conversations].map(&:id)).to include(participating_conversation.id)
- end
- end
-end
diff --git a/spec/enterprise/models/account_user_spec.rb b/spec/enterprise/models/account_user_spec.rb
index e157d9acd..fb572e86a 100644
--- a/spec/enterprise/models/account_user_spec.rb
+++ b/spec/enterprise/models/account_user_spec.rb
@@ -29,24 +29,6 @@ RSpec.describe AccountUser, type: :model do
end
end
- describe 'unread filter count invalidation' do
- it 'notifies when the assigned custom role changes' do
- account = create(:account)
- custom_role = create(:custom_role, account: account)
- account_user = create(:account_user, account: account)
- notifier = instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true)
- allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
-
- account_user.update!(custom_role: custom_role)
-
- expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(
- account: account,
- user: account_user.user
- )
- expect(notifier).to have_received(:perform)
- end
- end
-
describe 'audit log' do
context 'when account user is created' do
it 'has associated audit log created' do
diff --git a/spec/enterprise/models/custom_role_spec.rb b/spec/enterprise/models/custom_role_spec.rb
index 553a5a33a..f63f3c2dd 100644
--- a/spec/enterprise/models/custom_role_spec.rb
+++ b/spec/enterprise/models/custom_role_spec.rb
@@ -9,38 +9,4 @@ RSpec.describe CustomRole, type: :model do
describe 'validations' do
it { is_expected.to validate_presence_of(:name) }
end
-
- describe 'unread filter count invalidation' do
- it 'notifies assigned users when permissions change' do
- account = create(:account)
- custom_role = create(:custom_role, account: account, permissions: ['conversation_participating_manage'])
- account_user = create(:account_user, account: account, custom_role: custom_role)
- notifier = instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true)
- allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
-
- custom_role.update!(permissions: ['conversation_manage'])
-
- expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(
- account: account,
- user: account_user.user
- )
- expect(notifier).to have_received(:perform)
- end
-
- it 'notifies assigned users when the custom role is destroyed' do
- account = create(:account)
- custom_role = create(:custom_role, account: account, permissions: ['conversation_participating_manage'])
- account_user = create(:account_user, account: account, custom_role: custom_role)
- notifier = instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true)
- allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
-
- custom_role.destroy!
-
- expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(
- account: account,
- user: account_user.user
- )
- expect(notifier).to have_received(:perform)
- end
- end
end
diff --git a/spec/enterprise/services/conversations/unread_counts/counter_spec.rb b/spec/enterprise/services/conversations/unread_counts/counter_spec.rb
index 86a93bd8c..e8f850e78 100644
--- a/spec/enterprise/services/conversations/unread_counts/counter_spec.rb
+++ b/spec/enterprise/services/conversations/unread_counts/counter_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Conversations::UnreadCounts::Counter do
end
after do
- store.clear_all_account!(account.id)
+ store.clear_account!(account.id)
end
it 'uses base counts for custom roles with conversation_manage permission' do
@@ -26,16 +26,10 @@ RSpec.describe Conversations::UnreadCounts::Counter do
result = described_class.new(account: account, user: agent).perform
- expect(result).to eq(
- all_count: 2,
- inboxes: { inbox.id.to_s => 2 },
- labels: { label.id.to_s => 2 },
- teams: { team.id.to_s => 2 },
- mentions_count: 0,
- participating_count: 0,
- unattended_count: 2,
- folders: {}
- )
+ expect(result[:all_count]).to eq(2)
+ expect(result[:inboxes]).to eq(inbox.id.to_s => 2)
+ expect(result[:labels]).to eq(label.id.to_s => 2)
+ expect(result[:teams]).to eq(team.id.to_s => 2)
expect(store.assignment_ready?(account.id)).to be(false)
end
@@ -43,21 +37,14 @@ RSpec.describe Conversations::UnreadCounts::Counter do
account_user.update!(custom_role: create(:custom_role, account: account, permissions: ['conversation_unassigned_manage']))
create_unread_conversation(account: account, inbox: inbox, labels: [label.title], assignee: agent, team: team)
create_unread_conversation(account: account, inbox: inbox, labels: [label.title], team: team)
- other_assigned_conversation = create_unread_conversation(account: account, inbox: inbox, labels: [label.title], assignee: other_agent, team: team)
- create(:conversation_participant, account: account, conversation: other_assigned_conversation, user: agent)
+ create_unread_conversation(account: account, inbox: inbox, labels: [label.title], assignee: other_agent, team: team)
result = described_class.new(account: account, user: agent).perform
- expect(result).to eq(
- all_count: 2,
- inboxes: { inbox.id.to_s => 2 },
- labels: { label.id.to_s => 2 },
- teams: { team.id.to_s => 2 },
- mentions_count: 0,
- participating_count: 0,
- unattended_count: 2,
- folders: {}
- )
+ expect(result[:all_count]).to eq(2)
+ expect(result[:inboxes]).to eq(inbox.id.to_s => 2)
+ expect(result[:labels]).to eq(label.id.to_s => 2)
+ expect(result[:teams]).to eq(team.id.to_s => 2)
expect(store.assignment_ready?(account.id)).to be(true)
end
@@ -65,21 +52,13 @@ RSpec.describe Conversations::UnreadCounts::Counter do
account_user.update!(custom_role: create(:custom_role, account: account, permissions: ['conversation_participating_manage']))
create_unread_conversation(account: account, inbox: inbox, labels: [label.title], assignee: agent, team: team)
create_unread_conversation(account: account, inbox: inbox, labels: [label.title], team: team)
- participating_conversation = create_unread_conversation(account: account, inbox: inbox, labels: [label.title], team: team)
- create(:conversation_participant, account: account, conversation: participating_conversation, user: agent)
result = described_class.new(account: account, user: agent).perform
- expect(result).to eq(
- all_count: 1,
- inboxes: { inbox.id.to_s => 1 },
- labels: { label.id.to_s => 1 },
- teams: { team.id.to_s => 1 },
- mentions_count: 0,
- participating_count: 1,
- unattended_count: 1,
- folders: {}
- )
+ expect(result[:all_count]).to eq(1)
+ expect(result[:inboxes]).to eq(inbox.id.to_s => 1)
+ expect(result[:labels]).to eq(label.id.to_s => 1)
+ expect(result[:teams]).to eq(team.id.to_s => 1)
expect(store.assignment_ready?(account.id)).to be(true)
end
@@ -89,16 +68,7 @@ RSpec.describe Conversations::UnreadCounts::Counter do
result = described_class.new(account: account, user: agent).perform
- expect(result).to eq(
- all_count: 0,
- inboxes: {},
- labels: {},
- teams: {},
- mentions_count: 0,
- participating_count: 0,
- unattended_count: 0,
- folders: {}
- )
+ expect(result).to eq(all_count: 0, inboxes: {}, labels: {}, teams: {})
expect(store.base_ready?(account.id)).to be(false)
expect(store.assignment_ready?(account.id)).to be(false)
end
diff --git a/spec/finders/conversation_finder_spec.rb b/spec/finders/conversation_finder_spec.rb
index 31cbceb6a..64f134fe2 100644
--- a/spec/finders/conversation_finder_spec.rb
+++ b/spec/finders/conversation_finder_spec.rb
@@ -208,25 +208,6 @@ describe ConversationFinder do
end
end
- context 'with participating conversation type' do
- let(:params) { { status: 'open', conversation_type: 'participating' } }
-
- it 'does not return participating conversations from inboxes where the agent is no longer a member' do
- visible_conversation = create(:conversation, account: account, inbox: inbox)
- inaccessible_conversation = create(:conversation, account: account, inbox: restricted_inbox)
- create(:inbox_member, user: user_1, inbox: restricted_inbox)
- create(:conversation_participant, account: account, conversation: visible_conversation, user: user_1)
- create(:conversation_participant, account: account, conversation: inaccessible_conversation, user: user_1)
- InboxMember.find_by!(user: user_1, inbox: restricted_inbox).destroy!
-
- result = conversation_finder.perform
- conversation_ids = result[:conversations].map(&:id)
-
- expect(conversation_ids).to include(visible_conversation.id)
- expect(conversation_ids).not_to include(inaccessible_conversation.id)
- end
- end
-
context 'without source' do
let(:params) { {} }
diff --git a/spec/listeners/action_cable_listener_spec.rb b/spec/listeners/action_cable_listener_spec.rb
index 7a774dbd5..cdb9a93cb 100644
--- a/spec/listeners/action_cable_listener_spec.rb
+++ b/spec/listeners/action_cable_listener_spec.rb
@@ -294,19 +294,5 @@ describe ActionCableListener do
listener.conversation_unread_count_changed(event)
end
-
- it 'supports user-scoped unread count refresh events' do
- event = Events::Base.new(event_name, Time.zone.now, account: account, user: agent)
-
- expect(ActionCableBroadcastJob).to receive(:perform_later).with(
- a_collection_containing_exactly(agent.pubsub_token),
- 'conversation.unread_count_changed',
- {
- account_id: account.id
- }
- )
-
- listener.conversation_unread_count_changed(event)
- end
end
end
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index d77a16fdb..38ca9694a 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -53,79 +53,38 @@ RSpec.describe Account do
describe 'conversation unread counts feature flag' do
let(:account) { create(:account) }
let(:inbox) { create(:inbox, account: account) }
- let(:user) { create(:user) }
let(:store) { Conversations::UnreadCounts::Store }
let(:inbox_key) { store.inbox_key(account.id, inbox.id) }
- let(:filter_keys) do
- [
- store.user_mentions_key(account.id, user.id),
- store.user_participating_key(account.id, user.id),
- store.user_unattended_key(account.id, user.id),
- store.user_folder_key(account.id, user.id, 1)
- ]
- end
after do
- store.clear_all_account!(account.id)
+ store.clear_account!(account.id)
end
- it 'clears all unread count cache when the feature is enabled' do
+ it 'clears unread count cache when the feature is enabled' do
build_unread_count_cache
account.enable_features!(:conversation_unread_counts)
- expect_unread_count_cache_cleared
+ expect(store.base_ready?(account.id)).to be(false)
+ expect(store.assignment_ready?(account.id)).to be(false)
+ expect(store.counts_for_keys([inbox_key])).to eq(inbox_key => 0)
end
- it 'clears all unread count cache when the feature is disabled' do
+ it 'clears unread count cache when the feature is disabled' do
account.enable_features!(:conversation_unread_counts)
build_unread_count_cache
account.disable_features!(:conversation_unread_counts)
- expect_unread_count_cache_cleared
- end
-
- it 'clears all unread count cache when account cache keys are reset' do
- build_unread_count_cache
-
- account.reset_cache_keys
-
- expect_unread_count_cache_cleared
- end
-
- def expect_unread_count_cache_cleared
- expect(unread_count_ready_markers).to all(be(false))
- expect(store.counts_for_keys(unread_count_keys).values).to all(eq(0))
- end
-
- def unread_count_ready_markers
- [
- store.base_ready?(account.id),
- store.assignment_ready?(account.id),
- store.filters_ready?(account.id, user.id)
- ]
- end
-
- def unread_count_keys
- [inbox_key] + filter_keys
+ expect(store.base_ready?(account.id)).to be(false)
+ expect(store.assignment_ready?(account.id)).to be(false)
+ expect(store.counts_for_keys([inbox_key])).to eq(inbox_key => 0)
end
def build_unread_count_cache
store.mark_base_ready!(account.id)
store.mark_assignment_ready!(account.id)
- store.mark_filters_ready!(account.id, user.id)
store.add_base_membership(account_id: account.id, inbox_id: inbox.id, label_ids: [], conversation_id: 1)
- store.add_filter_memberships(
- account_id: account.id,
- user_id: user.id,
- filters: {
- mentions: [1],
- participating: [2],
- unattended: [3]
- },
- folders: { 1 => [4] }
- )
end
end
diff --git a/spec/models/account_user_spec.rb b/spec/models/account_user_spec.rb
index 7acfc19cd..e5a560fe9 100644
--- a/spec/models/account_user_spec.rb
+++ b/spec/models/account_user_spec.rb
@@ -42,32 +42,4 @@ RSpec.describe AccountUser do
expect(user.assigned_conversations.count).to eq(0)
end
end
-
- describe 'unread filter count invalidation' do
- let(:notifier) { instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true) }
-
- before do
- allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
- end
-
- it 'notifies when the account role changes' do
- account_user.update!(role: :administrator)
-
- expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(
- account: account_user.account,
- user: account_user.user
- )
- expect(notifier).to have_received(:perform)
- end
-
- it 'notifies when account access is removed' do
- expect(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).with(
- account: account_user.account,
- user: account_user.user
- ).and_return(notifier)
- expect(notifier).to receive(:perform)
-
- account_user.destroy!
- end
- end
end
diff --git a/spec/models/inbox_member_spec.rb b/spec/models/inbox_member_spec.rb
index df569c695..b081c546c 100644
--- a/spec/models/inbox_member_spec.rb
+++ b/spec/models/inbox_member_spec.rb
@@ -18,30 +18,4 @@ RSpec.describe InboxMember do
end
end
end
-
- describe 'unread filter count invalidation' do
- let(:account) { create(:account) }
- let(:inbox) { create(:inbox, account: account) }
- let(:user) { create(:user, account: account, role: :agent) }
- let(:notifier) { instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true) }
-
- before do
- allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
- end
-
- it 'notifies when inbox access is added' do
- create(:inbox_member, inbox: inbox, user: user)
-
- expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(account: account, user: user)
- expect(notifier).to have_received(:perform)
- end
-
- it 'notifies when inbox access is removed' do
- inbox_member = create(:inbox_member, inbox: inbox, user: user)
- expect(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).with(account: account, user: user).and_return(notifier)
- expect(notifier).to receive(:perform)
-
- inbox_member.destroy!
- end
- end
end
diff --git a/spec/services/conversations/unread_counts/builder_spec.rb b/spec/services/conversations/unread_counts/builder_spec.rb
index fe1bdb6fa..4b3aec230 100644
--- a/spec/services/conversations/unread_counts/builder_spec.rb
+++ b/spec/services/conversations/unread_counts/builder_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Conversations::UnreadCounts::Builder do
let(:store) { Conversations::UnreadCounts::Store }
after do
- store.clear_all_account!(account.id)
+ store.clear_account!(account.id)
end
describe '#build_base!' do
@@ -75,173 +75,6 @@ RSpec.describe Conversations::UnreadCounts::Builder do
end
end
- describe '#build_filters_for!' do
- before do
- create(:inbox_member, user: assignee, inbox: inbox)
- end
-
- it 'stores unread open conversations by mentions and participating dimensions' do
- mentioned_conversation = create_unread_conversation(account: account, inbox: inbox)
- participating_conversation = create_unread_conversation(account: account, inbox: inbox)
- resolved_mentioned_conversation = create_unread_conversation(account: account, inbox: inbox)
- inaccessible_conversation = create_unread_conversation(account: account, inbox: create(:inbox, account: account))
- resolved_mentioned_conversation.update!(status: :resolved)
-
- create(:mention, account: account, conversation: mentioned_conversation, user: assignee)
- create(:mention, account: account, conversation: resolved_mentioned_conversation, user: assignee)
- create(:mention, account: account, conversation: inaccessible_conversation, user: assignee)
- create(:conversation_participant, account: account, conversation: participating_conversation, user: assignee)
-
- described_class.new(account).build_filters_for!(assignee)
-
- expect(store.filters_ready?(account.id, assignee.id)).to be(true)
- expect(redis_set_members(store.user_mentions_key(account.id, assignee.id))).to contain_exactly(mentioned_conversation.id.to_s)
- expect(redis_set_members(store.user_participating_key(account.id, assignee.id))).to contain_exactly(participating_conversation.id.to_s)
- end
-
- it 'excludes participating conversations that are no longer visible to the user' do
- participating_conversation = create_unread_conversation(account: account, inbox: inbox)
- create(:conversation_participant, account: account, conversation: participating_conversation, user: assignee)
- InboxMember.find_by!(user: assignee, inbox: inbox).destroy!
-
- described_class.new(account).build_filters_for!(assignee)
-
- expect(redis_set_members(store.user_participating_key(account.id, assignee.id))).to be_empty
- end
-
- it 'stores visible unread open unattended conversations' do
- no_first_reply_conversation = create_unread_conversation(account: account, inbox: inbox)
- waiting_conversation = create_unread_conversation(account: account, inbox: inbox)
- attended_conversation = create_unread_conversation(account: account, inbox: inbox)
- inaccessible_conversation = create_unread_conversation(account: account, inbox: create(:inbox, account: account))
- resolved_conversation = create_unread_conversation(account: account, inbox: inbox)
- create_read_conversation
-
- waiting_conversation.update!(first_reply_created_at: 5.minutes.ago)
- attended_conversation.update!(first_reply_created_at: 5.minutes.ago, waiting_since: nil)
- inaccessible_conversation.update!(first_reply_created_at: nil)
- resolved_conversation.update!(status: :resolved)
-
- described_class.new(account).build_filters_for!(assignee)
-
- expect(redis_set_members(store.user_unattended_key(account.id, assignee.id))).to contain_exactly(
- no_first_reply_conversation.id.to_s,
- waiting_conversation.id.to_s
- )
- end
-
- it 'stores folder memberships using the saved filter status conditions' do
- resolved_conversation = create_unread_conversation(account: account, inbox: inbox)
- resolved_conversation.update!(status: :resolved)
- create_unread_conversation(account: account, inbox: inbox, assignee: assignee)
- custom_filter = create(
- :custom_filter, account: account, user: assignee, filter_type: :conversation, query: filter_query('status', ['resolved'])
- )
-
- described_class.new(account).build_filters_for!(assignee)
-
- expect(redis_set_members(store.user_folder_key(account.id, assignee.id, custom_filter.id))).to contain_exactly(resolved_conversation.id.to_s)
- end
-
- it 'loads folder filters after taking the invalidation version snapshot' do
- create_unread_conversation(account: account, inbox: inbox)
- resolved_conversation = create_unread_conversation(account: account, inbox: inbox)
- resolved_conversation.update!(status: :resolved)
- custom_filter = create(
- :custom_filter, account: account, user: assignee, filter_type: :conversation, query: filter_query('status', ['open'])
- )
- notifier = instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true)
- allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
- filter_updated = false
- allow(store).to receive(:filter_version_snapshot).and_wrap_original do |method, *args|
- method.call(*args).tap do
- next if filter_updated
-
- filter_updated = true
- custom_filter.update!(query: filter_query('status', ['resolved']))
- end
- end
-
- described_class.new(account).build_filters_for!(assignee)
-
- expect(redis_set_members(store.user_folder_key(account.id, assignee.id, custom_filter.id))).to contain_exactly(resolved_conversation.id.to_s)
- end
-
- it 'expires relative-date folder caches at the next date boundary' do
- create(
- :custom_filter,
- account: account,
- user: assignee,
- filter_type: :conversation,
- query: filter_query('created_at', [7], filter_operator: 'days_before')
- )
- allow(store).to receive(:mark_filters_ready_if_current!).and_call_original
- expected_ttl = nil
-
- travel_to Time.zone.local(2026, 1, 1, 9, 30, 0) do
- expected_ttl = (Time.zone.tomorrow.beginning_of_day - Time.current).ceil
- described_class.new(account).build_filters_for!(assignee)
- end
-
- expect(store).to have_received(:mark_filters_ready_if_current!).with(
- account.id,
- assignee.id,
- version_snapshot: kind_of(Hash),
- expires_in: expected_ttl
- )
- end
-
- it 'does not mark filters ready when user filters are invalidated during the build' do
- conversation = create_unread_conversation(account: account, inbox: inbox)
- create(:mention, account: account, conversation: conversation, user: assignee)
- clear_user_filters_after_membership_write
-
- described_class.new(account).build_filters_for!(assignee)
-
- expect(store.filters_ready?(account.id, assignee.id)).to be(false)
- expect(redis_set_members(store.user_mentions_key(account.id, assignee.id))).to be_empty
- end
-
- it 'does not mark filters ready when account filters are invalidated during the build' do
- conversation = create_unread_conversation(account: account, inbox: inbox)
- create(:mention, account: account, conversation: conversation, user: assignee)
- clear_filter_caches_after_membership_write
-
- described_class.new(account).build_filters_for!(assignee)
-
- expect(store.filters_ready?(account.id, assignee.id)).to be(false)
- expect(redis_set_members(store.user_mentions_key(account.id, assignee.id))).to be_empty
- end
-
- it 'skips invalid folder filters and still marks the user filter cache ready' do
- create_unread_conversation(account: account, inbox: inbox)
- invalid_filter = create(
- :custom_filter, account: account, user: assignee, filter_type: :conversation, query: filter_query('missing_attribute', ['open'])
- )
-
- described_class.new(account).build_filters_for!(assignee)
-
- expect(store.filters_ready?(account.id, assignee.id)).to be(true)
- expect(redis_set_members(store.user_folder_key(account.id, assignee.id, invalid_filter.id))).to be_empty
- end
-
- it 'skips folder filters that fail when the SQL query is executed' do
- conversation = create_unread_conversation(account: account, inbox: inbox)
- invalid_filter = create(
- :custom_filter,
- account: account,
- user: assignee,
- filter_type: :conversation,
- query: filter_query('display_id', [conversation.display_id.to_s], filter_operator: 'contains')
- )
-
- expect { described_class.new(account).build_filters_for!(assignee) }.not_to raise_error
-
- expect(store.filters_ready?(account.id, assignee.id)).to be(true)
- expect(redis_set_members(store.user_folder_key(account.id, assignee.id, invalid_filter.id))).to be_empty
- end
- end
-
def create_read_conversation
conversation = create(:conversation, account: account, inbox: inbox, agent_last_seen_at: 1.minute.from_now)
create(:message, account: account, inbox: inbox, conversation: conversation, message_type: :incoming)
@@ -257,32 +90,4 @@ RSpec.describe Conversations::UnreadCounts::Builder do
def redis_set_members(key)
Redis::Alfred.pipelined { |pipeline| pipeline.smembers(key) }.first
end
-
- def clear_user_filters_after_membership_write
- allow(store).to receive(:add_filter_memberships).and_wrap_original do |method, *args, **kwargs|
- method.call(*args, **kwargs)
- store.clear_user_filters!(account.id, assignee.id)
- end
- end
-
- def clear_filter_caches_after_membership_write
- allow(store).to receive(:add_filter_memberships).and_wrap_original do |method, *args, **kwargs|
- method.call(*args, **kwargs)
- store.clear_filter_caches!(account.id)
- end
- end
-
- def filter_query(attribute_key, values, filter_operator: 'equal_to')
- {
- payload: [
- {
- attribute_key: attribute_key,
- filter_operator: filter_operator,
- values: values,
- query_operator: nil,
- custom_attribute_type: ''
- }
- ]
- }
- end
end
diff --git a/spec/services/conversations/unread_counts/counter_spec.rb b/spec/services/conversations/unread_counts/counter_spec.rb
index c3c338355..723f2d437 100644
--- a/spec/services/conversations/unread_counts/counter_spec.rb
+++ b/spec/services/conversations/unread_counts/counter_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Conversations::UnreadCounts::Counter do
end
after do
- store.clear_all_account!(account.id)
+ store.clear_account!(account.id)
end
it 'builds the base cache on demand' do
@@ -32,7 +32,6 @@ RSpec.describe Conversations::UnreadCounts::Counter do
lock_key = "UNREAD_CONVERSATIONS::V1::ACCOUNT::#{account.id}::BUILD_LOCK::BASE"
lock_manager = instance_double(Redis::LockManager)
allow(Redis::LockManager).to receive(:new).and_return(lock_manager)
- allow(lock_manager).to receive(:with_lock).and_yield.and_return(true)
allow(lock_manager).to receive(:with_lock).with(lock_key, described_class::BUILD_LOCK_TTL).and_yield.and_return(true)
create_unread_conversation(account: account, inbox: visible_inbox, labels: [label.title], team: visible_team)
@@ -47,33 +46,13 @@ RSpec.describe Conversations::UnreadCounts::Counter do
counter = described_class.new(account: account, user: agent)
allow(Redis::LockManager).to receive(:new).and_return(lock_manager)
- allow(counter).to receive(:wait_for_cache_ready) do
- store.mark_base_ready!(account.id)
- store.mark_filters_ready!(account.id, agent.id)
- end
+ allow(counter).to receive(:wait_for_cache_ready) { store.mark_base_ready!(account.id) }
expect(Conversations::UnreadCounts::Builder).not_to receive(:new)
counter.perform
expect(counter).to have_received(:wait_for_cache_ready)
expect(store.base_ready?(account.id)).to be(true)
- expect(store.filters_ready?(account.id, agent.id)).to be(true)
- end
-
- it 'retries when a build finishes without marking the cache ready' do
- builder = instance_double(Conversations::UnreadCounts::Builder)
- attempts = 0
- allow(Conversations::UnreadCounts::Builder).to receive(:new).and_return(builder)
- allow(builder).to receive(:build_base!) do
- attempts += 1
- store.mark_base_ready!(account.id) if attempts == 2
- end
- allow(builder).to receive(:build_filters_for!) { store.mark_filters_ready!(account.id, agent.id) }
-
- described_class.new(account: account, user: agent).perform
-
- expect(builder).to have_received(:build_base!).twice
- expect(store.base_ready?(account.id)).to be(true)
end
it 'counts unread conversations only across inboxes visible to a normal agent' do
@@ -86,11 +65,7 @@ RSpec.describe Conversations::UnreadCounts::Counter do
all_count: 1,
inboxes: { visible_inbox.id.to_s => 1 },
labels: { label.id.to_s => 1 },
- teams: { visible_team.id.to_s => 1 },
- mentions_count: 0,
- participating_count: 0,
- unattended_count: 1,
- folders: {}
+ teams: { visible_team.id.to_s => 1 }
)
end
@@ -104,11 +79,7 @@ RSpec.describe Conversations::UnreadCounts::Counter do
all_count: 2,
inboxes: { visible_inbox.id.to_s => 1, hidden_inbox.id.to_s => 1 },
labels: { label.id.to_s => 2 },
- teams: { visible_team.id.to_s => 2 },
- mentions_count: 0,
- participating_count: 0,
- unattended_count: 2,
- folders: {}
+ teams: { visible_team.id.to_s => 2 }
)
end
@@ -121,46 +92,7 @@ RSpec.describe Conversations::UnreadCounts::Counter do
all_count: 1,
inboxes: { visible_inbox.id.to_s => 1 },
labels: {},
- teams: { visible_team.id.to_s => 1 },
- mentions_count: 0,
- participating_count: 0,
- unattended_count: 1,
- folders: {}
+ teams: { visible_team.id.to_s => 1 }
)
end
-
- it 'returns mention, participating, unattended, and valid folder unread counts for the user' do
- mentioned_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
- participating_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
- resolved_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
- resolved_conversation.update!(status: :resolved)
- valid_folder = create(:custom_filter, account: account, user: agent, filter_type: :conversation, query: filter_query('status', ['resolved']))
- invalid_folder = create(:custom_filter, account: account, user: agent, filter_type: :conversation, query: filter_query('unknown', ['open']))
-
- create(:mention, account: account, conversation: mentioned_conversation, user: agent)
- create(:conversation_participant, account: account, conversation: participating_conversation, user: agent)
-
- result = described_class.new(account: account, user: agent).perform
-
- expect(result[:mentions_count]).to eq(1)
- expect(result[:participating_count]).to eq(1)
- expect(result[:unattended_count]).to eq(2)
- expect(result[:folders]).to eq(valid_folder.id.to_s => 1)
- expect(result[:folders]).not_to have_key(invalid_folder.id.to_s)
- expect(store.filters_ready?(account.id, agent.id)).to be(true)
- end
-
- def filter_query(attribute_key, values)
- {
- payload: [
- {
- attribute_key: attribute_key,
- filter_operator: 'equal_to',
- values: values,
- query_operator: nil,
- custom_attribute_type: ''
- }
- ]
- }
- end
end
diff --git a/spec/services/conversations/unread_counts/listener_spec.rb b/spec/services/conversations/unread_counts/listener_spec.rb
index 0cf31bd3c..fbb0a0835 100644
--- a/spec/services/conversations/unread_counts/listener_spec.rb
+++ b/spec/services/conversations/unread_counts/listener_spec.rb
@@ -21,22 +21,13 @@ RSpec.describe Conversations::UnreadCounts::Listener do
expect(notifier).to have_received(:perform)
end
- it 'clears user filter counts when a non-incoming message updates last activity' do
- account.enable_features!(:conversation_unread_counts)
+ it 'ignores outgoing message creation' do
message = create(:message, account: account, inbox: conversation.inbox, conversation: conversation, message_type: :outgoing)
event = Events::Base.new('message.created', Time.zone.now, message: message)
- allow(store).to receive(:clear_filter_caches!).and_return(true)
- allow(Rails.configuration.dispatcher).to receive(:dispatch)
listener.message_created(event)
expect(Conversations::UnreadCounts::Notifier).not_to have_received(:new)
- expect(store).to have_received(:clear_filter_caches!).with(account.id)
- expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
- 'conversation.unread_count_changed',
- kind_of(Time),
- conversation: conversation
- )
end
it 'ignores incoming message creation when conversation unread counts are disabled' do
@@ -61,7 +52,6 @@ RSpec.describe Conversations::UnreadCounts::Listener do
end
it 'refreshes unread counts when labels change' do
- account.enable_features!(:conversation_unread_counts)
changed_attributes = { label_list: [%w[old], %w[new]] }
event = Events::Base.new('conversation.updated', Time.zone.now, conversation: conversation, changed_attributes: changed_attributes)
@@ -71,43 +61,8 @@ RSpec.describe Conversations::UnreadCounts::Listener do
expect(notifier).to have_received(:perform)
end
- it 'clears user filter counts when a folder filter dimension changes' do
- account.enable_features!(:conversation_unread_counts)
+ it 'ignores conversation updates unrelated to unread count dimensions' do
event = Events::Base.new('conversation.updated', Time.zone.now, conversation: conversation, changed_attributes: { priority: [nil, 'high'] })
- allow(store).to receive(:clear_filter_caches!).and_return(true)
- allow(Rails.configuration.dispatcher).to receive(:dispatch)
-
- listener.conversation_updated(event)
-
- expect(Conversations::UnreadCounts::Notifier).not_to have_received(:new)
- expect(store).to have_received(:clear_filter_caches!).with(account.id)
- expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
- 'conversation.unread_count_changed',
- kind_of(Time),
- conversation: conversation
- )
- end
-
- it 'clears user filter counts when the conversation contact changes' do
- account.enable_features!(:conversation_unread_counts)
- event = Events::Base.new('conversation.contact_changed', Time.zone.now, conversation: conversation)
- allow(store).to receive(:clear_filter_caches!).and_return(true)
- allow(Rails.configuration.dispatcher).to receive(:dispatch)
-
- listener.conversation_contact_changed(event)
-
- expect(Conversations::UnreadCounts::Notifier).not_to have_received(:new)
- expect(store).to have_received(:clear_filter_caches!).with(account.id)
- expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
- 'conversation.unread_count_changed',
- kind_of(Time),
- conversation: conversation
- )
- end
-
- it 'ignores conversation updates without changed attributes' do
- account.enable_features!(:conversation_unread_counts)
- event = Events::Base.new('conversation.updated', Time.zone.now, conversation: conversation, changed_attributes: {})
listener.conversation_updated(event)
@@ -173,7 +128,7 @@ RSpec.describe Conversations::UnreadCounts::Listener do
conversation_data: conversation_data.stringify_keys
)
ensure
- store.clear_all_account!(account.id)
+ store.clear_account!(account.id)
end
def deleted_conversation_data(conversation)
diff --git a/spec/services/conversations/unread_counts/notifier_spec.rb b/spec/services/conversations/unread_counts/notifier_spec.rb
index 645c2bc17..1b35d37f6 100644
--- a/spec/services/conversations/unread_counts/notifier_spec.rb
+++ b/spec/services/conversations/unread_counts/notifier_spec.rb
@@ -29,18 +29,6 @@ RSpec.describe Conversations::UnreadCounts::Notifier do
expect(Rails.configuration.dispatcher).not_to have_received(:dispatch)
end
-
- it 'dispatches unread count changed event when user filter caches were cleared' do
- allow(Conversations::UnreadCounts::Store).to receive(:clear_filter_caches!).and_return(true)
-
- described_class.new(conversation).perform
-
- expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
- 'conversation.unread_count_changed',
- kind_of(Time),
- conversation: conversation
- )
- end
end
context 'when conversation unread counts feature is disabled' do
diff --git a/spec/services/conversations/unread_counts/refresher_spec.rb b/spec/services/conversations/unread_counts/refresher_spec.rb
index e961c21c3..5f361e7aa 100644
--- a/spec/services/conversations/unread_counts/refresher_spec.rb
+++ b/spec/services/conversations/unread_counts/refresher_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Conversations::UnreadCounts::Refresher do
let(:store) { Conversations::UnreadCounts::Store }
after do
- store.clear_all_account!(account.id)
+ store.clear_account!(account.id)
end
it 'does not update redis when unread caches are not ready' do
diff --git a/spec/services/conversations/unread_counts/store_spec.rb b/spec/services/conversations/unread_counts/store_spec.rb
index 9e1311727..fcf21c985 100644
--- a/spec/services/conversations/unread_counts/store_spec.rb
+++ b/spec/services/conversations/unread_counts/store_spec.rb
@@ -7,10 +7,9 @@ RSpec.describe Conversations::UnreadCounts::Store do
let(:user_id) { 4 }
let(:conversation_id) { 5 }
let(:team_id) { 6 }
- let(:other_user_id) { 8 }
after do
- described_class.clear_all_account!(account_id)
+ described_class.clear_account!(account_id)
end
describe 'key builders' do
@@ -46,69 +45,20 @@ RSpec.describe Conversations::UnreadCounts::Store do
'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::TEAM::6::INBOX::2::ASSIGNEE::4'
)
end
-
- it 'builds user filter keys using the Redis key naming convention' do
- expect(described_class.user_mentions_key(account_id, user_id)).to eq(
- 'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::MENTIONS'
- )
- expect(described_class.user_participating_key(account_id, user_id)).to eq(
- 'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::PARTICIPATING'
- )
- expect(described_class.user_unattended_key(account_id, user_id)).to eq(
- 'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::UNATTENDED'
- )
- expect(described_class.user_folder_key(account_id, user_id, 7)).to eq(
- 'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::FOLDER::7'
- )
- end
end
describe 'ready markers' do
- it 'starts with all ready markers missing' do
+ it 'tracks base and assignment readiness independently' do
expect(described_class.base_ready?(account_id)).to be(false)
expect(described_class.assignment_ready?(account_id)).to be(false)
- expect(described_class.filters_ready?(account_id, user_id)).to be(false)
- end
- it 'tracks base, assignment, and user filter readiness independently' do
described_class.mark_base_ready!(account_id)
described_class.mark_assignment_ready!(account_id)
- described_class.mark_filters_ready!(account_id, user_id)
expect(described_class.base_ready?(account_id)).to be(true)
expect(described_class.assignment_ready?(account_id)).to be(true)
- expect(described_class.filters_ready?(account_id, user_id)).to be(true)
expect(ttl_for('UNREAD_CONVERSATIONS::V1::ACCOUNT::1::READY::BASE')).to be_within(5).of(Conversations::UnreadCounts::READY_TTL)
expect(ttl_for('UNREAD_CONVERSATIONS::V1::ACCOUNT::1::READY::ASSIGNMENT')).to be_within(5).of(Conversations::UnreadCounts::READY_TTL)
- expect(ttl_for('UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::READY::FILTERS')).to be_within(5).of(
- Conversations::UnreadCounts::READY_TTL
- )
- end
-
- it 'tracks filter invalidation versions independently' do
- expect(described_class.filter_version_snapshot(account_id, user_id)).to eq(account: 0, user: 0)
-
- expect(described_class.clear_user_filters!(account_id, user_id)).to be(false)
-
- expect(described_class.filter_version_snapshot(account_id, user_id)).to eq(account: 0, user: 1)
- expect(ttl_for(user_filter_version_key)).to be_within(5).of(Conversations::UnreadCounts::SET_TTL)
-
- expect(described_class.clear_filter_caches!(account_id)).to be(false)
-
- expect(described_class.filter_version_snapshot(account_id, user_id)).to eq(account: 1, user: 1)
- expect(ttl_for(account_filter_version_key)).to be_within(5).of(Conversations::UnreadCounts::SET_TTL)
- end
-
- it 'marks filter caches ready only when the invalidation version is current' do
- version_snapshot = described_class.filter_version_snapshot(account_id, user_id)
-
- expect(described_class.mark_filters_ready_if_current!(account_id, user_id, version_snapshot: version_snapshot)).to be_truthy
- expect(described_class.filters_ready?(account_id, user_id)).to be(true)
-
- described_class.clear_user_filters!(account_id, user_id)
-
- expect(described_class.mark_filters_ready_if_current!(account_id, user_id, version_snapshot: version_snapshot)).to be(false)
- expect(described_class.filters_ready?(account_id, user_id)).to be(false)
end
end
@@ -200,94 +150,9 @@ RSpec.describe Conversations::UnreadCounts::Store do
expect(base_keys.map { |key| ttl_for(key) }).to all(be_within(5).of(Conversations::UnreadCounts::SET_TTL))
end
- it 'adds, counts, and clears user filter memberships' do
- described_class.add_filter_memberships(
- account_id: account_id,
- user_id: user_id,
- filters: {
- mentions: [conversation_id],
- participating: [conversation_id],
- unattended: [conversation_id]
- },
- folders: { 7 => [conversation_id] }
- )
- described_class.mark_filters_ready!(account_id, user_id)
-
- expect(described_class.counts_for_keys(user_filter_keys)).to eq(
- described_class.user_mentions_key(account_id, user_id) => 1,
- described_class.user_participating_key(account_id, user_id) => 1,
- described_class.user_unattended_key(account_id, user_id) => 1,
- described_class.user_folder_key(account_id, user_id, 7) => 1
- )
- expect(user_filter_keys.map { |key| ttl_for(key) }).to all(be_within(5).of(Conversations::UnreadCounts::SET_TTL))
-
- expect(described_class.clear_user_filters!(account_id, user_id)).to be(true)
-
- expect(described_class.filters_ready?(account_id, user_id)).to be(false)
- expect(described_class.counts_for_keys(user_filter_keys).values).to all(eq(0))
- end
-
- it 'preserves the user filter build lock when clearing one user filter cache' do
- described_class.add_filter_memberships(
- account_id: account_id,
- user_id: user_id,
- filters: {
- mentions: [conversation_id],
- participating: [conversation_id],
- unattended: [conversation_id]
- },
- folders: { 7 => [conversation_id] }
- )
- described_class.mark_filters_ready!(account_id, user_id)
- Redis::Alfred.set(user_filter_build_lock_key, 'locked')
-
- expect(described_class.clear_user_filters!(account_id, user_id)).to be(true)
-
- expect(Redis::Alfred.exists?(user_filter_build_lock_key)).to be(true)
- expect(described_class.filters_ready?(account_id, user_id)).to be(false)
- expect(described_class.counts_for_keys(user_filter_keys).values).to all(eq(0))
- end
-
- it 'preserves user filter build locks when clearing all account filter caches' do
- described_class.add_filter_memberships(
- account_id: account_id,
- user_id: user_id,
- filters: {
- mentions: [conversation_id],
- participating: [],
- unattended: []
- },
- folders: {}
- )
- described_class.add_filter_memberships(
- account_id: account_id,
- user_id: other_user_id,
- filters: {
- mentions: [conversation_id],
- participating: [],
- unattended: []
- },
- folders: {}
- )
- described_class.mark_filters_ready!(account_id, user_id)
- described_class.mark_filters_ready!(account_id, other_user_id)
- Redis::Alfred.set(user_filter_build_lock_key, 'locked')
- Redis::Alfred.set(user_filter_build_lock_key(other_user_id), 'locked')
-
- expect(described_class.clear_filter_caches!(account_id)).to be(true)
-
- expect(Redis::Alfred.exists?(user_filter_build_lock_key)).to be(true)
- expect(Redis::Alfred.exists?(user_filter_build_lock_key(other_user_id))).to be(true)
- expect(described_class.filters_ready?(account_id, user_id)).to be(false)
- expect(described_class.filters_ready?(account_id, other_user_id)).to be(false)
- expect(described_class.counts_for_keys([described_class.user_mentions_key(account_id, user_id)]).values).to all(eq(0))
- expect(described_class.counts_for_keys([described_class.user_mentions_key(account_id, other_user_id)]).values).to all(eq(0))
- end
-
- it 'clears account memberships without clearing user filter memberships' do
+ it 'clears all account memberships' do
described_class.mark_base_ready!(account_id)
described_class.mark_assignment_ready!(account_id)
- described_class.mark_filters_ready!(account_id, user_id)
described_class.add_base_membership(
account_id: account_id,
inbox_id: inbox_id,
@@ -303,69 +168,13 @@ RSpec.describe Conversations::UnreadCounts::Store do
team_id: team_id,
conversation_id: conversation_id
)
- described_class.add_filter_memberships(
- account_id: account_id,
- user_id: user_id,
- filters: {
- mentions: [conversation_id],
- participating: [],
- unattended: []
- },
- folders: {}
- )
- Redis::Alfred.set(user_filter_build_lock_key, 'locked')
described_class.clear_account!(account_id)
expect(described_class.base_ready?(account_id)).to be(false)
expect(described_class.assignment_ready?(account_id)).to be(false)
- expect(described_class.filters_ready?(account_id, user_id)).to be(true)
expect(described_class.counts_for_keys(base_keys).values).to all(eq(0))
expect(described_class.counts_for_keys(assignment_keys).values).to all(eq(0))
- expect(described_class.counts_for_keys([described_class.user_mentions_key(account_id, user_id)]).values).to all(eq(1))
- expect(Redis::Alfred.exists?(user_filter_build_lock_key)).to be(true)
- end
-
- it 'clears all account unread count keys' do
- described_class.mark_base_ready!(account_id)
- described_class.mark_assignment_ready!(account_id)
- described_class.mark_filters_ready!(account_id, user_id)
- described_class.add_base_membership(
- account_id: account_id,
- inbox_id: inbox_id,
- label_ids: [label_id],
- team_id: team_id,
- conversation_id: conversation_id
- )
- described_class.add_assignment_membership(
- account_id: account_id,
- inbox_id: inbox_id,
- label_ids: [label_id],
- assignee_id: user_id,
- team_id: team_id,
- conversation_id: conversation_id
- )
- described_class.add_filter_memberships(
- account_id: account_id,
- user_id: user_id,
- filters: {
- mentions: [conversation_id],
- participating: [],
- unattended: []
- },
- folders: {}
- )
- Redis::Alfred.set(user_filter_build_lock_key, 'locked')
-
- described_class.clear_all_account!(account_id)
-
- expect(described_class.base_ready?(account_id)).to be(false)
- expect(described_class.assignment_ready?(account_id)).to be(false)
- expect(described_class.filters_ready?(account_id, user_id)).to be(false)
- expect(described_class.counts_for_keys(base_keys).values).to all(eq(0))
- expect(described_class.counts_for_keys(assignment_keys).values).to all(eq(0))
- expect(described_class.counts_for_keys([described_class.user_mentions_key(account_id, user_id)]).values).to all(eq(0))
- expect(Redis::Alfred.exists?(user_filter_build_lock_key)).to be(false)
end
end
@@ -385,27 +194,6 @@ RSpec.describe Conversations::UnreadCounts::Store do
]
end
- def user_filter_keys(filter_user_id = user_id)
- [
- described_class.user_mentions_key(account_id, filter_user_id),
- described_class.user_participating_key(account_id, filter_user_id),
- described_class.user_unattended_key(account_id, filter_user_id),
- described_class.user_folder_key(account_id, filter_user_id, 7)
- ]
- end
-
- def user_filter_build_lock_key(filter_user_id = user_id)
- format(Redis::Alfred::UNREAD_CONVERSATIONS_USER_FILTERS_BUILD_LOCK, account_id: account_id, user_id: filter_user_id)
- end
-
- def account_filter_version_key
- format(Redis::Alfred::UNREAD_CONVERSATIONS_FILTERS_VERSION, account_id: account_id)
- end
-
- def user_filter_version_key(filter_user_id = user_id)
- format(Redis::Alfred::UNREAD_CONVERSATIONS_USER_FILTERS_VERSION, account_id: account_id, user_id: filter_user_id)
- end
-
def ttl_for(key)
Redis::Alfred.ttl(key)
end
diff --git a/spec/services/conversations/unread_counts/user_filter_notifier_spec.rb b/spec/services/conversations/unread_counts/user_filter_notifier_spec.rb
deleted file mode 100644
index 1d898b103..000000000
--- a/spec/services/conversations/unread_counts/user_filter_notifier_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe Conversations::UnreadCounts::UserFilterNotifier do
- let(:account) { create(:account) }
- let(:user) { create(:user, account: account) }
- let(:store) { Conversations::UnreadCounts::Store }
-
- after do
- store.clear_all_account!(account.id)
- end
-
- it 'clears the user filter cache and dispatches an unread count refresh event' do
- account.enable_features!(:conversation_unread_counts)
- store.mark_filters_ready!(account.id, user.id)
- allow(Rails.configuration.dispatcher).to receive(:dispatch)
-
- described_class.new(account: account, user: user).perform
-
- expect(store.filters_ready?(account.id, user.id)).to be(false)
- expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
- 'conversation.unread_count_changed',
- kind_of(Time),
- account: account,
- user: user
- )
- end
-
- it 'does nothing when conversation unread counts are disabled' do
- store.mark_filters_ready!(account.id, user.id)
- allow(Rails.configuration.dispatcher).to receive(:dispatch)
-
- described_class.new(account: account, user: user).perform
-
- expect(store.filters_ready?(account.id, user.id)).to be(true)
- expect(Rails.configuration.dispatcher).not_to have_received(:dispatch)
- end
-end
From 5ce6e00730d6b0f0ec6eb1b6c68178b2cfdd2078 Mon Sep 17 00:00:00 2001
From: Sony Mathew <2040199+sony-mathew@users.noreply.github.com>
Date: Wed, 17 Jun 2026 18:06:42 +0530
Subject: [PATCH 20/26] Bump version to 4.15.1
---
VERSION_CW | 2 +-
config/app.yml | 2 +-
package.json | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/VERSION_CW b/VERSION_CW
index 5c517bf11..fb0557132 100644
--- a/VERSION_CW
+++ b/VERSION_CW
@@ -1 +1 @@
-4.15.0
+4.15.1
diff --git a/config/app.yml b/config/app.yml
index c2c192018..a55b621f6 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
shared: &shared
- version: '4.15.0'
+ version: '4.15.1'
development:
<<: *shared
diff --git a/package.json b/package.json
index b8ab60839..65dd48d27 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@chatwoot/chatwoot",
- "version": "4.15.0",
+ "version": "4.15.1",
"license": "MIT",
"scripts": {
"eslint": "eslint app/**/*.{js,vue}",
From ac153394566de1aed26a56fb9aaa8ff72019659f Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Fri, 19 Jun 2026 12:16:47 +0530
Subject: [PATCH 21/26] fix: Resolve Firefox input issues and persist advanced
filters (#14781)
# Pull Request Template
## Description
This PR fixes a few issues in Global Search and removes a non-functional
control.
* Fixes an issue in Firefox where characters could be dropped while
typing in the search input. The search now uses the latest input value
directly, preventing searches from running one character behind.
* Removes a stale query sync in `SearchHeader` that could overwrite
recently typed characters during the debounce window, causing the input
to appear out of sync.
* Fixes advanced search filters being removed from the URL on page
reload. The search page now waits for account data to load before
parsing URL parameters, ensuring agent, inbox, and date range filters
are preserved.
* Removes the non-functional "Sort by relevance" button from the search
tabs bar, as it was disabled and had no effect.
Fixes https://github.com/chatwoot/chatwoot/issues/14684
[CW-7305](https://linear.app/chatwoot/issue/CW-7305/global-search-drops-characters-while-typing-in-firefox-query-truncated)
[CW-7370](https://linear.app/chatwoot/issue/CW-7370/remove-non-functional-relevance-placeholder-button-from-global-search)
## Type of change
- [x] Bug fix (non-breaking change which fixes an issue)
## How Has This Been Tested?
### Screencast
**Before**
https://github.com/user-attachments/assets/48d72a4e-20f4-4f24-91f4-2c9a9c065eba
**After**
https://github.com/user-attachments/assets/0e41a803-b4fd-410d-a739-549f72d418d6
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [x] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---
.../search/components/SearchHeader.vue | 12 +------
.../modules/search/components/SearchInput.vue | 9 +++--
.../modules/search/components/SearchTabs.vue | 13 --------
.../modules/search/components/SearchView.vue | 33 ++++++++++++-------
4 files changed, 28 insertions(+), 39 deletions(-)
diff --git a/app/javascript/dashboard/modules/search/components/SearchHeader.vue b/app/javascript/dashboard/modules/search/components/SearchHeader.vue
index 08d4c0c7a..1de642fbe 100644
--- a/app/javascript/dashboard/modules/search/components/SearchHeader.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchHeader.vue
@@ -1,5 +1,5 @@
diff --git a/app/javascript/dashboard/modules/search/components/SearchInput.vue b/app/javascript/dashboard/modules/search/components/SearchInput.vue
index 3edd79fe0..de2db176f 100644
--- a/app/javascript/dashboard/modules/search/components/SearchInput.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchInput.vue
@@ -30,10 +30,13 @@ const debouncedEmit = debounce(
500
);
-const onInput = () => {
- debouncedEmit(searchQuery.value);
+const onInput = e => {
+ // Use the DOM value, not searchQuery.value: the defineModel ref updates a tick
+ // later, so reading it back here lags one character behind.
+ const value = e.target.value;
+ debouncedEmit(value);
- if (searchQuery.value.trim()) {
+ if (value.trim()) {
showRecentSearches.value = false;
} else if (isInputFocused.value) {
showRecentSearches.value = true;
diff --git a/app/javascript/dashboard/modules/search/components/SearchTabs.vue b/app/javascript/dashboard/modules/search/components/SearchTabs.vue
index 86e40df57..1a0fea65c 100644
--- a/app/javascript/dashboard/modules/search/components/SearchTabs.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchTabs.vue
@@ -1,8 +1,6 @@
@@ -39,12 +59,21 @@ const localeCount = computed(() => props.locales?.length);
{{ $t('HELP_CENTER.LOCALES_PAGE.LOCALES_COUNT', localeCount) }}
-
+
+
+
+
@@ -54,7 +83,13 @@ const localeCount = computed(() => props.locales?.length);
>
-
Date: Sat, 20 Jun 2026 14:47:08 -0700
Subject: [PATCH 26/26] feat(captain): allow agents to report Captain messages
(#14799)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Adds a cloud-only flow for agents to flag incorrect or problematic
Captain (AI) responses. Right-clicking a Captain message surfaces a
"Report message" option that opens a dialog to pick a problem type and
add a description, persisted to a new captain_message_reports table for
the team to review.
---------
Co-authored-by: Claude Opus 4.8 (1M context)
---
.../dashboard/api/captain/messageReports.js | 9 ++
.../components-next/message/Message.vue | 10 ++
.../i18n/locale/en/conversation.json | 19 +++
.../components/MessageContextMenu.vue | 21 ++++
.../components/ReportCaptainMessageDialog.vue | 119 ++++++++++++++++++
config/routes.rb | 1 +
...20000000_create_captain_message_reports.rb | 14 +++
db/schema.rb | 17 ++-
.../captain/message_reports_controller.rb | 38 ++++++
.../app/models/captain/message_report.rb | 46 +++++++
.../app/models/enterprise/concerns/message.rb | 1 +
.../message_reports/create.json.jbuilder | 7 ++
.../message_reports_controller_spec.rb | 117 +++++++++++++++++
.../models/captain/message_report_spec.rb | 40 ++++++
spec/factories/captain/message_report.rb | 8 ++
15 files changed, 466 insertions(+), 1 deletion(-)
create mode 100644 app/javascript/dashboard/api/captain/messageReports.js
create mode 100644 app/javascript/dashboard/modules/conversations/components/ReportCaptainMessageDialog.vue
create mode 100644 db/migrate/20260620000000_create_captain_message_reports.rb
create mode 100644 enterprise/app/controllers/api/v1/accounts/captain/message_reports_controller.rb
create mode 100644 enterprise/app/models/captain/message_report.rb
create mode 100644 enterprise/app/views/api/v1/accounts/captain/message_reports/create.json.jbuilder
create mode 100644 spec/enterprise/controllers/api/v1/accounts/captain/message_reports_controller_spec.rb
create mode 100644 spec/enterprise/models/captain/message_report_spec.rb
create mode 100644 spec/factories/captain/message_report.rb
diff --git a/app/javascript/dashboard/api/captain/messageReports.js b/app/javascript/dashboard/api/captain/messageReports.js
new file mode 100644
index 000000000..2df1e5747
--- /dev/null
+++ b/app/javascript/dashboard/api/captain/messageReports.js
@@ -0,0 +1,9 @@
+import ApiClient from '../ApiClient';
+
+class MessageReports extends ApiClient {
+ constructor() {
+ super('captain/message_reports', { accountScoped: true });
+ }
+}
+
+export default new MessageReports();
diff --git a/app/javascript/dashboard/components-next/message/Message.vue b/app/javascript/dashboard/components-next/message/Message.vue
index 0ef64eedf..cd3c7d5dc 100644
--- a/app/javascript/dashboard/components-next/message/Message.vue
+++ b/app/javascript/dashboard/components-next/message/Message.vue
@@ -147,8 +147,14 @@ const { t } = useI18n();
const route = useRoute();
const inboxGetter = useMapGetter('inboxes/getInbox');
const inbox = computed(() => inboxGetter.value(props.inboxId) || {});
+const isOnChatwootCloud = useMapGetter('globalConfig/isOnChatwootCloud');
const { replaceInstallationName } = useBranding();
+const isCaptainMessage = computed(() => {
+ const senderType = props.sender?.type ?? props.senderType;
+ return senderType === SENDER_TYPES.CAPTAIN_ASSISTANT;
+});
+
/**
* Computes the message variant based on props
* @type {import('vue').ComputedRef<'user'|'agent'|'activity'|'private'|'bot'|'template'>}
@@ -390,6 +396,10 @@ const contextMenuEnabledOptions = computed(() => {
!props.private &&
props.inboxSupportsReplyTo.outgoing &&
!isFailedOrProcessing,
+ report:
+ isOnChatwootCloud.value &&
+ isCaptainMessage.value &&
+ !isMessageDeleted.value,
};
});
diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index 045b8d0d9..c34ed44de 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -304,6 +304,25 @@
"MESSAGE": "You cannot undo this action",
"DELETE": "Delete",
"CANCEL": "Cancel"
+ },
+ "REPORT_MESSAGE": {
+ "LABEL": "Report message",
+ "TITLE": "Report Captain message",
+ "DESCRIPTION": "Found an issue with this AI response? Let us know what went wrong and our team will review it to help improve Captain's accuracy.",
+ "PROBLEM_TYPE": "Problem type",
+ "PROBLEM_TYPE_PLACEHOLDER": "Select a problem type",
+ "DESCRIPTION_LABEL": "Description",
+ "DESCRIPTION_PLACEHOLDER": "Describe the problem in detail",
+ "SUBMIT": "Report",
+ "SUCCESS": "Thanks for reporting. Our team will take a look.",
+ "ERROR": "Could not report this message. Please try again.",
+ "REASONS": {
+ "incorrect_information": "Incorrect information",
+ "inappropriate_response": "Inappropriate response",
+ "incomplete_response": "Incomplete response",
+ "outdated_information": "Outdated information",
+ "other": "Other"
+ }
}
},
"SIDEBAR": {
diff --git a/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue b/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue
index a100b379f..4cfde97aa 100644
--- a/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue
+++ b/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue
@@ -14,6 +14,7 @@ import {
import MenuItem from '../../../components/widgets/conversation/contextMenu/menuItem.vue';
import { useTrack } from 'dashboard/composables';
import NextButton from 'dashboard/components-next/button/Button.vue';
+import ReportCaptainMessageDialog from './ReportCaptainMessageDialog.vue';
export default {
components: {
@@ -21,6 +22,7 @@ export default {
MenuItem,
ContextMenu,
NextButton,
+ ReportCaptainMessageDialog,
},
props: {
message: {
@@ -152,6 +154,10 @@ export default {
closeDeleteModal() {
this.showDeleteModal = false;
},
+ openReportDialog() {
+ this.handleClose();
+ this.$refs.reportDialog?.open();
+ },
},
};
@@ -243,6 +249,16 @@ export default {
variant="icon"
@click.stop="showCannedResponseModal"
/>
+
+
+
+ {{ t('CONVERSATION_SIDEBAR.SHARED_FILES.FILES_HEADING') }} + + {{ fileAttachments.length }} + +
+-
+
-
+ ++
+ +++ {{ displayName(attachment) }} +
++ {{ displaySize(attachment) }} + + · {{ displayTime(attachment) }} + +
++++ +
+
+ {{ t('CONVERSATION_SIDEBAR.SHARED_FILES.MEDIA_HEADING') }} + + {{ mediaAttachments.length }} + +
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ displayDuration(attachment) }}
+
+
+
+ {{ displayTime(attachment) }}
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ t('CONVERSATION_SIDEBAR.SHARED_FILES.MORE_COUNT', {
+ count: overflow,
+ })
+ }}
+
+
+
+
+
{
@tab-changed="handleTabChange"
/>
+
+
{
/>
- [...allAttachments.value].sort(
- (a, b) => (b.created_at || 0) - (a.created_at || 0)
- )
-);
+const { t } = useI18n();
const mediaAttachments = computed(() =>
- sortedAttachments.value.filter(a => MEDIA_TYPES.includes(a.file_type))
+ allAttachments.value
+ .filter(a => MEDIA_TYPES.includes(a.file_type) && a.data_url)
+ .sort((a, b) => (b.created_at || 0) - (a.created_at || 0))
);
-const fileAttachments = computed(() =>
- sortedAttachments.value.filter(
- a => !MEDIA_TYPES.includes(a.file_type) && a.data_url
+const hasContent = computed(() =>
+ allAttachments.value.some(
+ a => a.data_url && !NON_FILE_TYPES.includes(a.file_type)
)
);
-const showAllMedia = ref(false);
-const showAllFiles = ref(false);
-
-const visibleMedia = computed(() =>
- showAllMedia.value
- ? mediaAttachments.value
- : mediaAttachments.value.slice(0, MEDIA_PEEK_LIMIT)
-);
-
-const visibleFiles = computed(() =>
- showAllFiles.value
- ? fileAttachments.value
- : fileAttachments.value.slice(0, FILES_PEEK_LIMIT)
-);
-
-const mediaOverflow = computed(() => {
- const total = mediaAttachments.value.length;
- return total > MEDIA_PEEK_LIMIT ? total - (MEDIA_PEEK_LIMIT - 1) : 0;
-});
-
const showGallery = ref(false);
const selectedAttachment = ref(null);
-const downloadingId = ref(null);
-const fileNameFromUrl = url => {
- if (!url) return '';
- const name = url.split('/').pop();
- return name ? decodeURIComponent(name) : '';
-};
-
-const onDownloadFile = async attachment => {
- const { id, file_type: type, data_url: url, extension } = attachment;
- try {
- downloadingId.value = id;
- await downloadFile({ url, type, extension });
- } catch (error) {
- useAlert(t('CONVERSATION_SIDEBAR.SHARED_FILES.DOWNLOAD_ERROR'));
- } finally {
- downloadingId.value = null;
- }
-};
-
-const isVideoType = type =>
- [ATTACHMENT_TYPES.VIDEO, ATTACHMENT_TYPES.IG_REEL].includes(type);
-
-const isAudioType = type => type === ATTACHMENT_TYPES.AUDIO;
-const isPlayableType = type => isVideoType(type) || isAudioType(type);
-
-const durations = ref({});
-
-const onLoadedMetadata = (attachment, event) => {
- const seconds = event.target?.duration;
- if (Number.isFinite(seconds) && seconds > 0) {
- durations.value[attachment.id] = seconds;
- }
-};
-
-const displayDuration = attachment => {
- const seconds = durations.value[attachment.id];
- return seconds ? formatDuration(Math.round(seconds)) : '';
-};
-
-const isOverflowTile = index =>
- !showAllMedia.value &&
- mediaOverflow.value > 0 &&
- index === MEDIA_PEEK_LIMIT - 1;
-
-const onTileActivate = (attachment, index) => {
- if (isOverflowTile(index)) {
- showAllMedia.value = true;
- return;
- }
+const onMediaSelect = attachment => {
selectedAttachment.value = attachment;
showGallery.value = true;
};
-const failedThumbs = ref(new Set());
-const failedPreviews = ref(new Set());
-
-const imagePreviewSrc = ({
- id,
- file_type: type,
- thumb_url: thumbUrl,
- data_url: dataUrl,
-}) => {
- const canUseThumb = thumbUrl && !failedThumbs.value.has(id);
- if (type === ATTACHMENT_TYPES.IMAGE) return canUseThumb ? thumbUrl : dataUrl;
- if (isVideoType(type)) return canUseThumb ? thumbUrl : null;
- return null;
-};
-
-const onPreviewError = ({
- id,
- file_type: type,
- thumb_url: thumbUrl,
- data_url: dataUrl,
-}) => {
- const canRetryWithFull = thumbUrl && !failedThumbs.value.has(id) && dataUrl;
- if (
- canRetryWithFull &&
- (type === ATTACHMENT_TYPES.IMAGE || isVideoType(type))
- ) {
- failedThumbs.value.add(id);
- return;
+const onFileSelect = attachment => {
+ if (attachment.data_url) {
+ window.open(attachment.data_url, '_blank', 'noopener,noreferrer');
}
- failedPreviews.value.add(id);
-};
-
-const hasPreview = attachment =>
- !!imagePreviewSrc(attachment) && !failedPreviews.value.has(attachment.id);
-const hasVideoPreview = attachment =>
- isVideoType(attachment.file_type) &&
- attachment.data_url &&
- !failedPreviews.value.has(attachment.id);
-
-const fallbackIcon = type => {
- if (type === ATTACHMENT_TYPES.AUDIO) return 'i-lucide-music';
- if (isVideoType(type)) return 'i-lucide-video';
- return 'i-lucide-image';
-};
-
-const displayName = attachment =>
- fileNameFromUrl(attachment.data_url) ||
- t('CONVERSATION_SIDEBAR.SHARED_FILES.UNTITLED_FILE');
-
-const displaySize = attachment => {
- if (attachment.file_size) return formatBytes(attachment.file_size);
- if (attachment.extension) return attachment.extension.toUpperCase();
- return '—';
-};
-
-const displayTime = attachment => {
- if (!attachment.created_at) return '';
- return shortTimestamp(dynamicTime(attachment.created_at), true);
};
-
+
-
-
-
-
-
-
-
-
-
-
+ {
const formData = new FormData();
@@ -114,6 +114,19 @@ export const actions = {
}
},
+ fetchAttachments: async ({ commit }, id) => {
+ commit(types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: true });
+ try {
+ const response = await ContactAPI.getAttachments(id);
+ commit(types.SET_CONTACT_ATTACHMENTS, {
+ id,
+ data: response.data.payload,
+ });
+ } finally {
+ commit(types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: false });
+ }
+ },
+
update: async ({ commit }, { id, isFormData = false, ...contactParams }) => {
const { avatar, customAttributes, ...paramsToDecamelize } = contactParams;
const decamelizedContactParams = {
diff --git a/app/javascript/dashboard/store/modules/contacts/getters.js b/app/javascript/dashboard/store/modules/contacts/getters.js
index 5a75ac091..425ba9449 100644
--- a/app/javascript/dashboard/store/modules/contacts/getters.js
+++ b/app/javascript/dashboard/store/modules/contacts/getters.js
@@ -24,6 +24,7 @@ export const getters = {
stopPaths: ['custom_attributes'],
});
},
+ getContactAttachments: $state => id => $state.records[id]?.attachments || [],
getMeta: $state => {
return $state.meta;
},
diff --git a/app/javascript/dashboard/store/modules/contacts/mutations.js b/app/javascript/dashboard/store/modules/contacts/mutations.js
index 5eef7e2b3..5fbd04ed1 100644
--- a/app/javascript/dashboard/store/modules/contacts/mutations.js
+++ b/app/javascript/dashboard/store/modules/contacts/mutations.js
@@ -58,7 +58,15 @@ export const mutations = {
},
[types.EDIT_CONTACT]: ($state, data) => {
- $state.records[data.id] = data;
+ const existingAttachments = $state.records[data.id]?.attachments;
+ $state.records[data.id] = existingAttachments
+ ? { ...data, attachments: existingAttachments }
+ : data;
+ },
+
+ [types.SET_CONTACT_ATTACHMENTS]: ($state, { id, data }) => {
+ if (!$state.records[id]) $state.records[id] = {};
+ $state.records[id].attachments = data;
},
[types.DELETE_CONTACT]: ($state, id) => {
diff --git a/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js b/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js
index 00b7bb83b..bb2f0393b 100644
--- a/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js
@@ -438,4 +438,48 @@ describe('#actions', () => {
]);
});
});
+
+ describe('#fetchAttachments', () => {
+ const attachments = [
+ { id: 11, message_id: 21, file_type: 'image' },
+ { id: 12, message_id: 22, file_type: 'file' },
+ ];
+
+ it('fetches and stores attachments on the contact record', async () => {
+ axios.get.mockResolvedValue({ data: { payload: attachments } });
+ const state = { records: { 1: { id: 1 } } };
+ await actions.fetchAttachments({ commit, state }, 1);
+ expect(commit.mock.calls).toEqual([
+ [types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: true }],
+ [types.SET_CONTACT_ATTACHMENTS, { id: 1, data: attachments }],
+ [types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: false }],
+ ]);
+ });
+
+ it('refetches even when attachments are already cached', async () => {
+ axios.get.mockResolvedValue({ data: { payload: attachments } });
+ const state = {
+ records: { 1: { id: 1, attachments: [{ id: 99 }] } },
+ };
+ await actions.fetchAttachments({ commit, state }, 1);
+ expect(axios.get).toHaveBeenCalled();
+ expect(commit.mock.calls).toEqual([
+ [types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: true }],
+ [types.SET_CONTACT_ATTACHMENTS, { id: 1, data: attachments }],
+ [types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: false }],
+ ]);
+ });
+
+ it('clears the loading flag and rethrows when the API errors', async () => {
+ axios.get.mockRejectedValue(new Error('Network error'));
+ const state = { records: { 1: { id: 1 } } };
+ await expect(
+ actions.fetchAttachments({ commit, state }, 1)
+ ).rejects.toThrow('Network error');
+ expect(commit.mock.calls).toEqual([
+ [types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: true }],
+ [types.SET_CONTACT_UI_FLAG, { isFetchingAttachments: false }],
+ ]);
+ });
+ });
});
diff --git a/app/javascript/dashboard/store/modules/specs/contacts/getters.spec.js b/app/javascript/dashboard/store/modules/specs/contacts/getters.spec.js
index 38973ec9d..260ca8f2a 100644
--- a/app/javascript/dashboard/store/modules/specs/contacts/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/contacts/getters.spec.js
@@ -50,4 +50,22 @@ describe('#getters', () => {
};
expect(getters.getAppliedContactFilters(state)).toEqual(filters);
});
+
+ describe('getContactAttachments', () => {
+ it('returns the attachments stored on the contact record', () => {
+ const data = [{ id: 11, file_type: 'image' }];
+ const state = { records: { 1: { id: 1, attachments: data } } };
+ expect(getters.getContactAttachments(state)(1)).toEqual(data);
+ });
+
+ it('returns an empty array when the contact has no cached attachments', () => {
+ const state = { records: { 1: { id: 1 } } };
+ expect(getters.getContactAttachments(state)(1)).toEqual([]);
+ });
+
+ it('returns an empty array when the contact is not in the store', () => {
+ const state = { records: {} };
+ expect(getters.getContactAttachments(state)(99)).toEqual([]);
+ });
+ });
});
diff --git a/app/javascript/dashboard/store/modules/specs/contacts/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/contacts/mutations.spec.js
index 4eb40ff61..962cc6ea4 100644
--- a/app/javascript/dashboard/store/modules/specs/contacts/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/contacts/mutations.spec.js
@@ -63,6 +63,21 @@ describe('#mutations', () => {
1: { id: 1, name: 'contact2', email: 'contact2@chatwoot.com' },
});
});
+
+ it('preserves a cached attachments list across edits', () => {
+ const attachments = [{ id: 11, file_type: 'image' }];
+ const state = {
+ records: {
+ 1: { id: 1, name: 'contact1', attachments },
+ },
+ };
+ mutations[types.EDIT_CONTACT](state, { id: 1, name: 'contact2' });
+ expect(state.records[1]).toEqual({
+ id: 1,
+ name: 'contact2',
+ attachments,
+ });
+ });
});
describe('#SET_CONTACT_FILTERS', () => {
@@ -102,4 +117,33 @@ describe('#mutations', () => {
expect(state.appliedFilters).toEqual([]);
});
});
+
+ describe('#SET_CONTACT_ATTACHMENTS', () => {
+ it('attaches the list to the existing contact record', () => {
+ const state = { records: { 1: { id: 1, name: 'Sivin' } } };
+ const data = [{ id: 11, file_type: 'image' }];
+ mutations[types.SET_CONTACT_ATTACHMENTS](state, { id: 1, data });
+ expect(state.records[1]).toEqual({
+ id: 1,
+ name: 'Sivin',
+ attachments: data,
+ });
+ });
+
+ it('creates a record shell when the contact is not yet loaded', () => {
+ const state = { records: {} };
+ const data = [{ id: 12, file_type: 'file' }];
+ mutations[types.SET_CONTACT_ATTACHMENTS](state, { id: 5, data });
+ expect(state.records[5]).toEqual({ attachments: data });
+ });
+
+ it('replaces an existing attachment list', () => {
+ const state = {
+ records: { 1: { id: 1, attachments: [{ id: 99 }] } },
+ };
+ const data = [{ id: 11 }];
+ mutations[types.SET_CONTACT_ATTACHMENTS](state, { id: 1, data });
+ expect(state.records[1].attachments).toEqual(data);
+ });
+ });
});
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 1597b7ea6..059d9636e 100644
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -139,6 +139,7 @@ export default {
SET_CONTACT_META: 'SET_CONTACT_META',
SET_CONTACT_UI_FLAG: 'SET_CONTACT_UI_FLAG',
SET_CONTACT_ITEM: 'SET_CONTACT_ITEM',
+ SET_CONTACT_ATTACHMENTS: 'SET_CONTACT_ATTACHMENTS',
SET_CONTACTS: 'SET_CONTACTS',
APPEND_CONTACTS: 'APPEND_CONTACTS',
CLEAR_CONTACTS: 'CLEAR_CONTACTS',
From ee6382109ad3fafdb7aaa51257be0f11fb801fc7 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan
Date: Mon, 15 Jun 2026 17:06:40 +0530
Subject: [PATCH 02/26] feat: prevent deleted email conversations from syncing
again (#14612)
# Pull Request Template
## Description
Prevent deleted email conversations from being synced into Chatwoot
again while they are still within the IMAP sync window.
When an admin explicitly deletes an email conversation, the incoming
email message IDs are stored temporarily in Redis. IMAP sync checks
these recently deleted message IDs in addition to existing message
records. Each Redis key expires automatically after two days.
This applies only to explicit conversation deletion. Individual message
deletion, inbox deletion, and account deletion keep their existing
behavior.
Fixes
[CW-7214](https://linear.app/chatwoot/issue/CW-7214/deleted-mails-in-gmail-inbox-gets-synced-again)
---
.../v1/accounts/conversations_controller.rb | 2 +-
app/services/conversations/delete_service.rb | 16 +++++++++
app/services/imap/base_fetch_email_service.rb | 6 +++-
app/services/imap/deleted_message_tracker.rb | 28 +++++++++++++++
lib/redis/redis_keys.rb | 2 ++
.../conversations/delete_service_spec.rb | 35 +++++++++++++++++++
.../services/imap/fetch_email_service_spec.rb | 22 ++++++++++++
7 files changed, 109 insertions(+), 2 deletions(-)
create mode 100644 app/services/conversations/delete_service.rb
create mode 100644 app/services/imap/deleted_message_tracker.rb
create mode 100644 spec/services/conversations/delete_service_spec.rb
diff --git a/app/controllers/api/v1/accounts/conversations_controller.rb b/app/controllers/api/v1/accounts/conversations_controller.rb
index 2856c7817..2e53fa7c9 100644
--- a/app/controllers/api/v1/accounts/conversations_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations_controller.rb
@@ -140,7 +140,7 @@ class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseContro
def destroy
authorize @conversation, :destroy?
- ::DeleteObjectJob.perform_later(@conversation, Current.user, request.ip)
+ ::Conversations::DeleteService.new(conversation: @conversation, user: Current.user, ip: request.ip).perform
head :ok
end
diff --git a/app/services/conversations/delete_service.rb b/app/services/conversations/delete_service.rb
new file mode 100644
index 000000000..6608cfdcd
--- /dev/null
+++ b/app/services/conversations/delete_service.rb
@@ -0,0 +1,16 @@
+class Conversations::DeleteService
+ pattr_initialize [:conversation!, :user, :ip]
+
+ def perform
+ track_deleted_email_messages
+ ::DeleteObjectJob.perform_later(conversation, user, ip)
+ end
+
+ private
+
+ def track_deleted_email_messages
+ return unless conversation.inbox.email?
+
+ Imap::DeletedMessageTracker.new(inbox: conversation.inbox).record(conversation.messages.incoming.pluck(:source_id))
+ end
+end
diff --git a/app/services/imap/base_fetch_email_service.rb b/app/services/imap/base_fetch_email_service.rb
index 24dd22589..e55355f3a 100644
--- a/app/services/imap/base_fetch_email_service.rb
+++ b/app/services/imap/base_fetch_email_service.rb
@@ -38,7 +38,11 @@ class Imap::BaseFetchEmailService
end
def email_already_present?(channel, message_id)
- channel.inbox.messages.find_by(source_id: message_id).present?
+ channel.inbox.messages.find_by(source_id: message_id).present? || deleted_message_tracker.deleted?(message_id)
+ end
+
+ def deleted_message_tracker
+ @deleted_message_tracker ||= Imap::DeletedMessageTracker.new(inbox: channel.inbox)
end
def fetch_mail_for_channel
diff --git a/app/services/imap/deleted_message_tracker.rb b/app/services/imap/deleted_message_tracker.rb
new file mode 100644
index 000000000..7892f258b
--- /dev/null
+++ b/app/services/imap/deleted_message_tracker.rb
@@ -0,0 +1,28 @@
+require 'digest'
+
+class Imap::DeletedMessageTracker
+ TTL = 2.days.to_i
+
+ pattr_initialize [:inbox!]
+
+ def record(source_ids)
+ return unless inbox.email?
+
+ keys = source_ids.compact_blank.map { |source_id| redis_key(source_id) }
+ return if keys.blank?
+
+ Redis::Alfred.pipelined do |pipeline|
+ keys.each { |key| pipeline.set(key, true, ex: TTL) }
+ end
+ end
+
+ def deleted?(source_id)
+ Redis::Alfred.exists?(redis_key(source_id))
+ end
+
+ private
+
+ def redis_key(source_id)
+ format(Redis::RedisKeys::IMAP_DELETED_MESSAGE, inbox_id: inbox.id, message_id_digest: Digest::SHA256.hexdigest(source_id))
+ end
+end
diff --git a/lib/redis/redis_keys.rb b/lib/redis/redis_keys.rb
index fff60c342..bc7fb551e 100644
--- a/lib/redis/redis_keys.rb
+++ b/lib/redis/redis_keys.rb
@@ -2,6 +2,8 @@ module Redis::RedisKeys
## Inbox Keys
# Array storing the ordered ids for agent round robin assignment
ROUND_ROBIN_AGENTS = 'ROUND_ROBIN_AGENTS:%d'.freeze
+ # Track recently deleted IMAP messages to prevent them from being synced again
+ IMAP_DELETED_MESSAGE = 'IMAP_DELETED_MESSAGE::%d::%s'.freeze
## Conversation keys
# Detect whether to send an email reply to the conversation
diff --git a/spec/services/conversations/delete_service_spec.rb b/spec/services/conversations/delete_service_spec.rb
new file mode 100644
index 000000000..2ff14db49
--- /dev/null
+++ b/spec/services/conversations/delete_service_spec.rb
@@ -0,0 +1,35 @@
+require 'rails_helper'
+
+RSpec.describe Conversations::DeleteService do
+ let(:account) { create(:account) }
+ let(:user) { create(:user, account: account) }
+ let(:ip) { '127.0.0.1' }
+ let(:service) { described_class.new(conversation: conversation, user: user, ip: ip) }
+
+ context 'when deleting an email conversation' do
+ let(:inbox) { create(:channel_email, :imap_email, account: account).inbox }
+ let(:conversation) { create(:conversation, account: account, inbox: inbox) }
+ let!(:incoming_message) { create(:message, account: account, inbox: inbox, conversation: conversation, source_id: 'incoming@example.com') }
+ let(:deleted_message_tracker) { instance_double(Imap::DeletedMessageTracker, record: true) }
+
+ before do
+ allow(Imap::DeletedMessageTracker).to receive(:new).with(inbox: inbox).and_return(deleted_message_tracker)
+ end
+
+ it 'records incoming message source ids and enqueues the deletion job' do
+ expect { service.perform }.to have_enqueued_job(DeleteObjectJob).with(conversation, user, ip)
+
+ expect(deleted_message_tracker).to have_received(:record).with([incoming_message.source_id])
+ end
+ end
+
+ context 'when deleting a non-email conversation' do
+ let(:conversation) { create(:conversation, account: account) }
+
+ it 'enqueues the deletion job without recording message source ids' do
+ expect(Imap::DeletedMessageTracker).not_to receive(:new)
+
+ expect { service.perform }.to have_enqueued_job(DeleteObjectJob).with(conversation, user, ip)
+ end
+ end
+end
diff --git a/spec/services/imap/fetch_email_service_spec.rb b/spec/services/imap/fetch_email_service_spec.rb
index 1f74cf0b7..b88e548d9 100644
--- a/spec/services/imap/fetch_email_service_spec.rb
+++ b/spec/services/imap/fetch_email_service_spec.rb
@@ -119,6 +119,28 @@ RSpec.describe Imap::FetchEmailService do
end
end
+ it 'does not return recently deleted emails' do
+ travel_to '26.10.2020 10:00'.to_datetime do
+ email_object = create_inbound_email_from_fixture('only_text.eml')
+ email_header = Net::IMAP::FetchData.new(1, 'BODY[HEADER]' => eml_content_with_message_id)
+ redis_key = format(Redis::RedisKeys::IMAP_DELETED_MESSAGE,
+ inbox_id: imap_email_channel.inbox.id,
+ message_id_digest: Digest::SHA256.hexdigest(email_object.message_id))
+
+ Imap::DeletedMessageTracker.new(inbox: imap_email_channel.inbox).record([email_object.message_id])
+ allow(imap).to receive(:search).with(%w[SINCE 25-Oct-2020]).and_return([1])
+ allow(imap).to receive(:fetch).with([1], 'BODY.PEEK[HEADER]').and_return([email_header])
+ allow(imap).to receive(:logout)
+
+ result = described_class.new(channel: imap_email_channel).perform
+
+ expect(result).to be_empty
+ expect(imap).not_to have_received(:fetch).with(1, 'RFC822')
+ ensure
+ Redis::Alfred.delete(redis_key) if redis_key
+ end
+ end
+
it 'does not count emails without message ids toward the sync limit' do
travel_to '26.10.2020 10:00'.to_datetime do
email_object = create_inbound_email_from_fixture('only_text.eml')
From ba0ba46c9c1c9ec09ebfc8b67bb1d122bfe3315a Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan
Date: Mon, 15 Jun 2026 17:14:34 +0530
Subject: [PATCH 03/26] fix: skip session tracking and use short-lived token
for impersonation (CW-7169) (#14622)
## Description
SuperAdmin impersonation SSO logins no longer create UserSession rows
visible to the customer. Impersonation tokens use a 2-day lifespan
instead of ~2 months, so they naturally evict first and don't linger in
the user's token list.
Server-side detection via Redis value (`'impersonation'` vs `'normal'`)
without changing the `valid_sso_auth_token?` signature. Backward
compatible with in-flight tokens.
Depends on #14556.
## Type of change
- [x] Bug fix (non-breaking change which fixes an issue)
## How Has This Been Tested?
Specs cover: impersonation login skips UserSession creation,
impersonation token has short lifespan, normal SSO login still creates
UserSession row.
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [x] Any dependent changes have been merged and published in downstream
modules
---
.../devise_overrides/sessions_controller.rb | 19 +++++--
app/models/concerns/sso_authenticatable.rb | 12 +++--
.../sessions_controller_spec.rb | 52 +++++++++++++++++++
3 files changed, 77 insertions(+), 6 deletions(-)
diff --git a/app/controllers/devise_overrides/sessions_controller.rb b/app/controllers/devise_overrides/sessions_controller.rb
index 1ef6d9511..7dae29d13 100644
--- a/app/controllers/devise_overrides/sessions_controller.rb
+++ b/app/controllers/devise_overrides/sessions_controller.rb
@@ -20,7 +20,7 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
end
def render_create_success
- track_user_session
+ track_user_session unless @impersonation
render partial: 'devise/auth', formats: [:json], locals: { resource: @resource }
end
@@ -66,7 +66,10 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
end
def authenticate_resource_with_sso_token
- @token = @resource.create_token
+ # DTA evicts the earliest-expiring token after save when at max_number_of_devices.
+ # The short-lived impersonation token would always be that one, so pre-evict to make room.
+ make_room_for_impersonation_token if @impersonation
+ @token = @resource.create_token(lifespan: @impersonation ? 2.days.to_i : nil)
@resource.save!
sign_in(:user, @resource, store: false, bypass: false)
@@ -74,11 +77,21 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
@resource.invalidate_sso_auth_token(params[:sso_auth_token])
end
+ def make_room_for_impersonation_token
+ return if @resource.tokens.size < DeviseTokenAuth.max_number_of_devices
+
+ oldest_client_id = @resource.tokens.min_by { |_, v| v['expiry'].to_i }&.first
+ @resource.tokens.delete(oldest_client_id) if oldest_client_id
+ end
+
def process_sso_auth_token
return if params[:email].blank?
user = User.from_email(params[:email])
- @resource = user if user&.valid_sso_auth_token?(params[:sso_auth_token])
+ return unless user&.valid_sso_auth_token?(params[:sso_auth_token])
+
+ @resource = user
+ @impersonation = user.sso_auth_token_impersonation?(params[:sso_auth_token])
end
def handle_mfa_required(user)
diff --git a/app/models/concerns/sso_authenticatable.rb b/app/models/concerns/sso_authenticatable.rb
index 98b50f336..633e71ee3 100644
--- a/app/models/concerns/sso_authenticatable.rb
+++ b/app/models/concerns/sso_authenticatable.rb
@@ -1,9 +1,9 @@
module SsoAuthenticatable
extend ActiveSupport::Concern
- def generate_sso_auth_token
+ def generate_sso_auth_token(impersonation: false)
token = SecureRandom.hex(32)
- ::Redis::Alfred.setex(sso_token_key(token), true, 5.minutes)
+ ::Redis::Alfred.setex(sso_token_key(token), impersonation ? 'impersonation' : 'normal', 5.minutes)
token
end
@@ -20,8 +20,14 @@ module SsoAuthenticatable
"#{ENV.fetch('FRONTEND_URL', nil)}/app/login?email=#{encoded_email}&sso_auth_token=#{generate_sso_auth_token}"
end
+ def sso_auth_token_impersonation?(token)
+ ::Redis::Alfred.get(sso_token_key(token)) == 'impersonation'
+ end
+
def generate_sso_link_with_impersonation
- "#{generate_sso_link}&impersonation=true"
+ encoded_email = ERB::Util.url_encode(email)
+ "#{ENV.fetch('FRONTEND_URL',
+ nil)}/app/login?email=#{encoded_email}&sso_auth_token=#{generate_sso_auth_token(impersonation: true)}&impersonation=true"
end
private
diff --git a/spec/controllers/devise_overrides/sessions_controller_spec.rb b/spec/controllers/devise_overrides/sessions_controller_spec.rb
index 7e12011b2..f40af6362 100644
--- a/spec/controllers/devise_overrides/sessions_controller_spec.rb
+++ b/spec/controllers/devise_overrides/sessions_controller_spec.rb
@@ -180,4 +180,56 @@ RSpec.describe DeviseOverrides::SessionsController, type: :controller do
end
end
end
+
+ describe 'impersonation SSO login' do
+ let(:user) { create(:user, password: 'Test@123456') }
+ let(:browser_ua) { 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.2.1 Safari/605.1.15' }
+
+ before { request.env['HTTP_USER_AGENT'] = browser_ua }
+
+ it 'does not create a UserSession row for impersonation login' do
+ sso_token = user.generate_sso_auth_token(impersonation: true)
+
+ expect do
+ post :create, params: { email: user.email, sso_auth_token: sso_token }
+ end.not_to change(user.user_sessions, :count)
+
+ expect(response).to have_http_status(:success)
+ end
+
+ it 'creates a short-lived token for impersonation login' do
+ sso_token = user.generate_sso_auth_token(impersonation: true)
+
+ post :create, params: { email: user.email, sso_auth_token: sso_token }
+
+ expect(response).to have_http_status(:success)
+ token_entry = user.reload.tokens.values.last
+ # 2-day lifespan: expiry should be within ~3 days from now (token creation + lifespan)
+ expect(token_entry['expiry']).to be < (3.days.from_now).to_i
+ end
+
+ it 'creates a normal UserSession row for regular SSO login' do
+ sso_token = user.generate_sso_auth_token
+
+ expect do
+ post :create, params: { email: user.email, sso_auth_token: sso_token }
+ end.to change(user.user_sessions, :count).by(1)
+ end
+
+ it 'preserves the impersonation token when target user is at the device cap' do
+ allow(DeviseTokenAuth).to receive(:max_number_of_devices).and_return(5)
+ 5.times do |i|
+ user.tokens["existing#{i}"] = { 'token' => 'x', 'expiry' => (Time.current + (30 + i).days).to_i }
+ end
+ user.save!
+ sso_token = user.generate_sso_auth_token(impersonation: true)
+
+ post :create, params: { email: user.email, sso_auth_token: sso_token }
+
+ expect(response).to have_http_status(:success)
+ new_client_id = response.headers['client']
+ expect(user.reload.tokens.keys).to include(new_client_id)
+ expect(user.tokens.size).to eq(5)
+ end
+ end
end
From 396631ad7d4c58b61296f999e53bf0c8bdd7c1de Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan
Date: Mon, 15 Jun 2026 17:28:13 +0530
Subject: [PATCH 04/26] feat: enforce concurrent session limit with login
picker (CW-7169) (#14621)
## Description
Cap active sessions at `MAX_USER_SESSIONS` which defaults to existing
value of `25` per user. This ensure existing user login behavior is not
affected for self-hosted installations. Browser users at the cap see a
session picker (409 response) to choose which session to end.
Non-browser clients and partially-tracked users get silent
oldest-session eviction.
Depends on #14556.
## Type of change
- [x] New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
Specs cover: under limit, at limit (browser picker, non-browser
eviction), partial tracking fallback, revoke single/all sessions during
login, session row creation on successful login.
---------
Co-authored-by: Sony Mathew
---
.../devise_overrides/sessions_controller.rb | 90 +++++++++++
.../components/auth/SessionLimitOverlay.vue | 141 ++++++++++++++++
.../helper/AnalyticsHelper/events.js | 1 +
.../dashboard/i18n/locale/en/index.js | 2 +
.../i18n/locale/en/sessionLimit.json | 12 ++
app/javascript/v3/api/auth.js | 9 ++
app/javascript/v3/views/login/Index.vue | 72 ++++++++-
.../sessions_controller_spec.rb | 152 +++++++++++++++++-
8 files changed, 476 insertions(+), 3 deletions(-)
create mode 100644 app/javascript/dashboard/components/auth/SessionLimitOverlay.vue
create mode 100644 app/javascript/dashboard/i18n/locale/en/sessionLimit.json
diff --git a/app/controllers/devise_overrides/sessions_controller.rb b/app/controllers/devise_overrides/sessions_controller.rb
index 7dae29d13..587b52c83 100644
--- a/app/controllers/devise_overrides/sessions_controller.rb
+++ b/app/controllers/devise_overrides/sessions_controller.rb
@@ -1,4 +1,6 @@
class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
+ MAX_SESSIONS = ENV.fetch('MAX_USER_SESSIONS', 25).to_i
+
# Prevent session parameter from being passed
# Unpermitted parameter: session
wrap_parameters format: []
@@ -14,6 +16,7 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
user = find_user_for_authentication
return handle_mfa_required(user) if user&.mfa_enabled?
+ return if user && enforce_session_limit_for_password_login(user)
# Only proceed with standard authentication if no MFA is required
super
@@ -54,6 +57,8 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
end
def handle_sso_authentication
+ return if !@impersonation && enforce_session_limit_for_password_login(@resource)
+
authenticate_resource_with_sso_token
yield @resource if block_given?
render_create_success
@@ -117,6 +122,7 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
end
def sign_in_mfa_user(user)
+ evict_oldest_session(user) if sessions_limit_reached?(user)
@resource = user
@token = @resource.create_token
@resource.save!
@@ -129,6 +135,90 @@ class DeviseOverrides::SessionsController < DeviseTokenAuth::SessionsController
render json: { error: I18n.t(message_key) }, status: status
end
+ def sessions_limit_reached?(user)
+ active_token_count(user) >= MAX_SESSIONS
+ end
+
+ def active_token_count(user)
+ now = Time.current.to_i
+ (user.tokens || {}).count { |_, v| v['expiry'].to_i > now }
+ end
+
+ # Returns true when a response has been rendered (e.g., 409 picker). Non-browser clients
+ # auto-evict instead of getting stuck on a UI they can't render.
+ def enforce_session_limit_for_password_login(user)
+ if revoking_sessions?
+ revoke_sessions_for_login(user)
+ return false
+ end
+
+ return false unless sessions_limit_reached?(user)
+
+ # Picker only when every token has a tracked session; partial tracking would
+ # show a misleading count, so fall through to silent eviction instead.
+ if browser_request? && user.user_sessions.count >= user.tokens.size
+ handle_sessions_limit_for_login(user)
+ true
+ else
+ evict_oldest_session(user)
+ false
+ end
+ end
+
+ def browser_request?
+ request.user_agent.to_s.include?('Mozilla')
+ end
+
+ def revoking_sessions?
+ params[:revoke_session_id].present? || params[:revoke_all_sessions].present?
+ end
+
+ def revoke_sessions_for_login(user)
+ if params[:revoke_all_sessions].present?
+ user.tokens = {}
+ user.save!
+ user.user_sessions.destroy_all
+ elsif params[:revoke_session_id].present?
+ session = user.user_sessions.find_by(id: params[:revoke_session_id])
+ return unless session
+
+ user.tokens.delete(session.client_id)
+ user.save!
+ session.destroy!
+ end
+ end
+
+ def evict_oldest_session(user)
+ # Drop pre-rollout untracked tokens first so freshly tracked logins aren't evicted.
+ return evict_oldest_token(user) if user.user_sessions.count < user.tokens.size
+
+ oldest_session = user.user_sessions.order(Arel.sql('COALESCE(last_activity_at, created_at) ASC')).first
+ return evict_oldest_token(user) unless oldest_session
+
+ user.tokens.delete(oldest_session.client_id)
+ user.save!
+ oldest_session.destroy!
+ end
+
+ # Fallback if a token exists without a UserSession row (e.g., legacy data before tracking shipped).
+ def evict_oldest_token(user)
+ return if user.tokens.blank?
+
+ oldest_client_id = user.tokens.min_by { |_, v| v['expiry'].to_i }&.first
+ return unless oldest_client_id
+
+ user.tokens.delete(oldest_client_id)
+ user.save!
+ end
+
+ PICKER_SESSION_FIELDS = %i[id browser_name browser_version device_name platform_name platform_version
+ ip_address city country last_activity_at created_at].freeze
+
+ def handle_sessions_limit_for_login(user)
+ sessions = user.user_sessions.order(last_activity_at: :desc).map { |s| s.slice(*PICKER_SESSION_FIELDS) }
+ render json: { sessions_limit_reached: true, sessions: sessions }, status: :conflict
+ end
+
def track_user_session
client_id = @token&.try(:client) || response.headers['client']
return unless client_id.present? && @resource.present?
diff --git a/app/javascript/dashboard/components/auth/SessionLimitOverlay.vue b/app/javascript/dashboard/components/auth/SessionLimitOverlay.vue
new file mode 100644
index 000000000..a3eed7184
--- /dev/null
+++ b/app/javascript/dashboard/components/auth/SessionLimitOverlay.vue
@@ -0,0 +1,141 @@
+
+
+
+
+
+
-
+
{ 'token' => 'x', 'expiry' => (Time.current + expiry_offset_days.days).to_i }
+ )
+ user.save!
+ user.user_sessions.create!(client_id: client_id, last_activity_at: Time.current) if with_session
+ end
+
+ def login_params
+ { email: user.email, password: 'Test@123456' }
+ end
+
+ context 'when under the limit' do
+ it 'allows login without intervention' do
+ request.env['HTTP_USER_AGENT'] = browser_ua
+ 3.times { |i| seed_token("c#{i}", expiry_offset_days: 30) }
+
+ post :create, params: login_params
+
+ expect(response).to have_http_status(:success)
+ end
+
+ it 'does not count expired tokens toward the cap' do
+ request.env['HTTP_USER_AGENT'] = browser_ua
+ # 3 expired + 2 active = 5 raw entries, but only 2 active
+ 3.times { |i| seed_token("expired#{i}", expiry_offset_days: -1, with_session: false) }
+ 2.times { |i| seed_token("active#{i}", expiry_offset_days: 30) }
+
+ post :create, params: login_params
+
+ expect(response).to have_http_status(:success)
+ end
+ end
+
+ context 'when at the limit from a browser with full tracking' do
+ before do
+ request.env['HTTP_USER_AGENT'] = browser_ua
+ 5.times { |i| seed_token("c#{i}", expiry_offset_days: 30) }
+ end
+
+ it 'returns 409 with the session list (picker)' do
+ post :create, params: login_params
+
+ expect(response).to have_http_status(:conflict)
+ body = response.parsed_body
+ expect(body['sessions_limit_reached']).to be true
+ expect(body['sessions'].size).to eq(5)
+ end
+
+ it 'does not create a new session row' do
+ expect { post :create, params: login_params }.not_to change(user.user_sessions, :count)
+ end
+ end
+
+ context 'when at the limit from a non-browser client' do
+ before do
+ request.env['HTTP_USER_AGENT'] = mobile_ua
+ 5.times { |i| seed_token("c#{i}", expiry_offset_days: 30 + i, with_session: false) }
+ end
+
+ it 'silently evicts the oldest token and lets login proceed' do
+ post :create, params: login_params
+
+ expect(response).to have_http_status(:success)
+ expect(user.reload.tokens.keys).not_to include('c0')
+ end
+ end
+
+ context 'when at the limit but tracking is partial (legacy tokens present)' do
+ before do
+ request.env['HTTP_USER_AGENT'] = browser_ua
+ # one tracked, four legacy (no user_session rows)
+ seed_token('tracked', expiry_offset_days: 60, with_session: true)
+ 4.times { |i| seed_token("legacy#{i}", expiry_offset_days: 10 + i, with_session: false) }
+ end
+
+ it 'silent-evicts instead of showing a partial picker' do
+ post :create, params: login_params
+
+ expect(response).to have_http_status(:success)
+ end
+
+ it 'drops an untracked token first, keeping the tracked session alive' do
+ post :create, params: login_params
+
+ tokens = user.reload.tokens.keys
+ expect(tokens).to include('tracked')
+ # legacy0 expires soonest -> evict_oldest_token picks it
+ expect(tokens).not_to include('legacy0')
+ end
+ end
+
+ context 'when at the limit with full tracking (no legacy gap)' do
+ before do
+ request.env['HTTP_USER_AGENT'] = mobile_ua
+ # Five tracked sessions, varying activity timestamps
+ 5.times do |i|
+ seed_token("tracked#{i}", expiry_offset_days: 30)
+ user.user_sessions.find_by(client_id: "tracked#{i}").update!(last_activity_at: (5 - i).days.ago)
+ end
+ end
+
+ it 'evicts the oldest tracked session by last_activity_at' do
+ post :create, params: login_params
+
+ expect(response).to have_http_status(:success)
+ # tracked0 had the oldest last_activity_at (5 days ago)
+ expect(user.reload.tokens.keys).not_to include('tracked0')
+ expect(user.user_sessions.exists?(client_id: 'tracked0')).to be false
+ end
+ end
+
+ context 'with revoke_session_id during login' do
+ before do
+ request.env['HTTP_USER_AGENT'] = browser_ua
+ 5.times { |i| seed_token("c#{i}", expiry_offset_days: 30) }
+ end
+
+ it 'revokes the chosen session and proceeds with login' do
+ target = user.user_sessions.find_by(client_id: 'c2')
+
+ post :create, params: login_params.merge(revoke_session_id: target.id)
+
+ expect(response).to have_http_status(:success)
+ expect(user.reload.tokens.keys).not_to include('c2')
+ expect(user.user_sessions.exists?(id: target.id)).to be false
+ end
+ end
+
+ context 'with revoke_all_sessions during login' do
+ before do
+ request.env['HTTP_USER_AGENT'] = browser_ua
+ 5.times { |i| seed_token("c#{i}", expiry_offset_days: 30) }
+ end
+
+ it 'wipes all sessions and tokens, then proceeds with login' do
+ post :create, params: login_params.merge(revoke_all_sessions: true)
+
+ expect(response).to have_http_status(:success)
+ expect(user.reload.tokens.keys).not_to include('c0', 'c1', 'c2', 'c3', 'c4')
+ # the new login adds one fresh token
+ expect(user.tokens.keys.size).to eq(1)
+ end
+ end
context 'with a successful login' do
before { request.env['HTTP_USER_AGENT'] = browser_ua }
it 'creates a UserSession row for the new client_id' do
- expect { post :create, params: { email: user.email, password: 'Test@123456' } }.to change(user.user_sessions, :count).by(1)
+ expect { post :create, params: login_params }.to change(user.user_sessions, :count).by(1)
session = user.user_sessions.last
expect(session.browser_name).to eq('Safari')
From 4816e923b66f7cfe2b881a6762a7f979219c3adb Mon Sep 17 00:00:00 2001
From: Sony Mathew
Date: Mon, 15 Jun 2026 17:58:04 +0530
Subject: [PATCH 05/26] chore: added a new sort by unread option for
conversations (CW-7152) (#14512)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## Description
Added a new option for the sort by option in conversation filters called
unread. This is to filter out unread conversations.
Fixes # CW-7152
## Type of change
Please delete options that are not relevant.
- [ ] Bug fix (non-breaking change which fixes an issue)
- [x] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality not to work as expected)
- [ ] This change requires a documentation update
## How Has This Been Tested?
Tested manually in local.
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [ ] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---
app/finders/conversation_finder.rb | 1 +
.../dashboard/components/ChatList.vue | 16 +++++
.../conversation/ConversationBasicFilter.vue | 4 ++
app/javascript/dashboard/constants/globals.js | 1 +
.../dashboard/i18n/locale/en/chatlist.json | 3 +
app/models/conversation.rb | 23 +++++++
spec/finders/conversation_finder_spec.rb | 61 +++++++++++++++++++
7 files changed, 109 insertions(+)
diff --git a/app/finders/conversation_finder.rb b/app/finders/conversation_finder.rb
index 1c27d8260..74bf903f5 100644
--- a/app/finders/conversation_finder.rb
+++ b/app/finders/conversation_finder.rb
@@ -12,6 +12,7 @@ class ConversationFinder
'waiting_since_asc' => %w[sort_on_waiting_since asc],
'waiting_since_desc' => %w[sort_on_waiting_since desc],
'priority_desc_created_at_asc' => %w[sort_on_priority_created_at desc],
+ 'unread' => %w[sort_on_unread desc],
# To be removed in v3.5.0
'latest' => %w[sort_on_last_activity_at desc],
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index c96716c5d..39fe35f3d 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -308,6 +308,15 @@ function filterByAssigneeTab(conversations) {
return [...conversations];
}
+function sortByUnreadStatus(conversations) {
+ return [...conversations].sort((a, b) => {
+ const unreadCountDiff = (b.unread_count || 0) - (a.unread_count || 0);
+ if (unreadCountDiff !== 0) return unreadCountDiff;
+
+ return (b.last_activity_at || 0) - (a.last_activity_at || 0);
+ });
+}
+
const conversationList = computed(() => {
let localConversationList = [];
@@ -337,6 +346,13 @@ const conversationList = computed(() => {
});
}
+ if (
+ !hasAppliedFiltersOrActiveFolders.value &&
+ activeSortBy.value === wootConstants.SORT_BY_TYPE.UNREAD
+ ) {
+ localConversationList = sortByUnreadStatus(localConversationList);
+ }
+
return localConversationList;
});
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
index fa1563ed8..38e85b485 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBasicFilter.vue
@@ -78,6 +78,10 @@ const chatSortOptions = computed(() => [
label: t('CHAT_LIST.SORT_ORDER_ITEMS.created_at_asc.TEXT'),
value: 'created_at_asc',
},
+ {
+ label: t('CHAT_LIST.SORT_ORDER_ITEMS.unread.TEXT'),
+ value: 'unread',
+ },
{
label: t('CHAT_LIST.SORT_ORDER_ITEMS.priority_desc.TEXT'),
value: 'priority_desc',
diff --git a/app/javascript/dashboard/constants/globals.js b/app/javascript/dashboard/constants/globals.js
index 889ece96a..24c0f07b1 100644
--- a/app/javascript/dashboard/constants/globals.js
+++ b/app/javascript/dashboard/constants/globals.js
@@ -27,6 +27,7 @@ export default {
WAITING_SINCE_ASC: 'waiting_since_asc',
WAITING_SINCE_DESC: 'waiting_since_desc',
PRIORITY_DESC_CREATED_AT_ASC: 'priority_desc_created_at_asc',
+ UNREAD: 'unread',
},
ARTICLE_STATUS_TYPES: {
DRAFT: 0,
diff --git a/app/javascript/dashboard/i18n/locale/en/chatlist.json b/app/javascript/dashboard/i18n/locale/en/chatlist.json
index 1384dae2b..45755892d 100644
--- a/app/javascript/dashboard/i18n/locale/en/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/en/chatlist.json
@@ -79,6 +79,9 @@
},
"priority_desc_created_at_asc": {
"TEXT": "Priority: Highest first, Created: Oldest first"
+ },
+ "unread": {
+ "TEXT": "Unread Count: Highest first"
}
},
"ATTACHMENTS": {
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 0005ae4a4..d9c06c4d8 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -78,6 +78,9 @@ class Conversation < ApplicationRecord
scope :unassigned, -> { where(assignee_id: nil) }
scope :assigned, -> { where.not(assignee_id: nil) }
scope :assigned_to, ->(agent) { where(assignee_id: agent.id) }
+ scope :sort_on_unread, lambda { |_direction|
+ order(unread_messages_count_arel.desc).sort_on_last_activity_at('desc')
+ }
scope :unattended, -> { where(first_reply_created_at: nil).or(where.not(waiting_since: nil)) }
scope :resolvable_not_waiting, lambda { |auto_resolve_after|
return none if auto_resolve_after.to_i.zero?
@@ -206,6 +209,26 @@ class Conversation < ApplicationRecord
inbox.inbox_type == 'Twitter' && additional_attributes['type'] == 'tweet'
end
+ def self.unread_messages_count_arel
+ messages = Message.arel_table
+ conversations = arel_table
+ unread_messages = messages
+ .project(messages[:id].count)
+ .where(unread_messages_condition(messages, conversations))
+
+ Arel::Nodes::Grouping.new(unread_messages.ast)
+ end
+
+ def self.unread_messages_condition(messages, conversations)
+ messages[:conversation_id].eq(conversations[:id])
+ .and(messages[:account_id].eq(conversations[:account_id]))
+ .and(messages[:message_type].eq(Message.message_types[:incoming]))
+ .and(
+ conversations[:agent_last_seen_at].eq(nil)
+ .or(messages[:created_at].gt(conversations[:agent_last_seen_at]))
+ )
+ end
+
def recent_messages
messages.chat.last(5)
end
diff --git a/spec/finders/conversation_finder_spec.rb b/spec/finders/conversation_finder_spec.rb
index 9427e8157..64f134fe2 100644
--- a/spec/finders/conversation_finder_spec.rb
+++ b/spec/finders/conversation_finder_spec.rb
@@ -96,6 +96,67 @@ describe ConversationFinder do
end
end
+ context 'with unread sort' do
+ let(:params) { { status: 'open', sort_by: 'unread' } }
+
+ it 'returns all conversations matching the selected status with the highest unread count first' do
+ most_unread_conversation = create(:conversation, account: account, inbox: inbox,
+ agent_last_seen_at: 1.hour.ago)
+ unread_conversation = create(:conversation, account: account, inbox: inbox,
+ agent_last_seen_at: 1.hour.ago)
+ read_conversation = create(:conversation, account: account, inbox: inbox,
+ agent_last_seen_at: 1.minute.from_now)
+ resolved_unread_conversation = create(:conversation, account: account, inbox: inbox, status: 'resolved',
+ agent_last_seen_at: 1.hour.ago)
+
+ [most_unread_conversation, unread_conversation, read_conversation, resolved_unread_conversation].each do |conversation|
+ create(:message, account: account, inbox: inbox, conversation: conversation,
+ message_type: :incoming, created_at: 5.minutes.ago)
+ end
+ create(:message, account: account, inbox: inbox, conversation: most_unread_conversation,
+ message_type: :incoming, created_at: 4.minutes.ago)
+ resolved_unread_conversation.update!(status: 'resolved')
+ read_conversation.update!(last_activity_at: 1.minute.from_now)
+ unread_conversation.update!(last_activity_at: 2.minutes.from_now)
+
+ result = conversation_finder.perform
+ conversation_ids = result[:conversations].map(&:id)
+
+ expect(conversation_ids).to include(most_unread_conversation.id, unread_conversation.id, read_conversation.id)
+ expect(conversation_ids).not_to include(resolved_unread_conversation.id)
+ expect(conversation_ids.index(most_unread_conversation.id)).to be < conversation_ids.index(unread_conversation.id)
+ expect(conversation_ids.index(unread_conversation.id)).to be < conversation_ids.index(read_conversation.id)
+ end
+
+ it 'includes private incoming messages in unread counts used for ordering' do
+ private_unread_conversation = create(:conversation, account: account, inbox: inbox,
+ agent_last_seen_at: 1.hour.ago)
+ unread_conversation = create(:conversation, account: account, inbox: inbox,
+ agent_last_seen_at: 1.hour.ago)
+ read_conversation = create(:conversation, account: account, inbox: inbox,
+ agent_last_seen_at: 1.minute.from_now)
+
+ 2.times do
+ create(:message, account: account, inbox: inbox, conversation: private_unread_conversation,
+ message_type: :incoming, private: true, created_at: 5.minutes.ago)
+ end
+ create(:message, account: account, inbox: inbox, conversation: unread_conversation,
+ message_type: :incoming, created_at: 5.minutes.ago)
+ create(:message, account: account, inbox: inbox, conversation: read_conversation,
+ message_type: :incoming, created_at: 5.minutes.ago)
+ private_unread_conversation.update!(last_activity_at: 10.minutes.ago)
+ unread_conversation.update!(last_activity_at: 2.minutes.from_now)
+ read_conversation.update!(last_activity_at: 1.minute.from_now)
+
+ result = conversation_finder.perform
+ conversation_ids = result[:conversations].map(&:id)
+
+ expect(private_unread_conversation.unread_incoming_messages.count).to eq 2
+ expect(conversation_ids.index(private_unread_conversation.id)).to be < conversation_ids.index(unread_conversation.id)
+ expect(conversation_ids.index(unread_conversation.id)).to be < conversation_ids.index(read_conversation.id)
+ end
+ end
+
context 'with assignee_type assigned' do
let(:params) { { assignee_type: 'assigned' } }
From d8a16278b988d086c825e98de945a9145d532180 Mon Sep 17 00:00:00 2001
From: Sony Mathew
Date: Mon, 15 Jun 2026 21:34:19 +0530
Subject: [PATCH 06/26] fix: added ordering capability for sidebar sections
folders, teams, channels and labels (CW-7193) (#14609)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## Description
* Added the ability to sort for 4 sub-sections under conversations
folders, teams, channels and labels.
* the sort options are basically created at, alphabetical and unread
counts along with both directions.
* for folders we don't have an unread count, so we sort it by only
created and alphabetical.
* all the sort preferences are stored on the frontend - easiest
implementation for now.
Fixes # CW-7193
## Type of change
Please delete options that are not relevant.
- [ ] Bug fix (non-breaking change which fixes an issue)
- [x] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality not to work as expected)
- [ ] This change requires a documentation update
## How Has This Been Tested?
Tested this locally by visually verifying the changes. Also ran the
newly added tests for component level changes.
Here is the screenshot of the changes:
Added the sort option to sub sections in the conversation sidebar:
The sort options looks like this:
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [ ] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---------
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: iamsivin
---
.../dropdown-menu/DropdownMenu.vue | 2 +-
.../components-next/sidebar/Sidebar.vue | 95 +++++---
.../sidebar/SidebarCollapsedPopover.vue | 66 ++++--
.../components-next/sidebar/SidebarGroup.vue | 15 +-
.../sidebar/SidebarGroupHeader.vue | 10 +-
.../sidebar/SidebarGroupSeparator.vue | 94 +++++---
.../sidebar/SidebarSortMenu.vue | 209 ++++++++++++++++++
.../sidebar/SidebarSubGroup.vue | 11 +-
.../dashboard/helper/sidebarSort.js | 181 +++++++++++++++
.../helper/specs/sidebarSort.spec.js | 205 +++++++++++++++++
.../dashboard/i18n/locale/en/settings.json | 15 ++
app/javascript/dashboard/store/index.js | 2 +
.../store/modules/sidebarSortPreferences.js | 82 +++++++
.../sidebarSortPreferences/actions.spec.js | 106 +++++++++
.../sidebarSortPreferences/getters.spec.js | 31 +++
.../sidebarSortPreferences/mutations.spec.js | 34 +++
16 files changed, 1071 insertions(+), 87 deletions(-)
create mode 100644 app/javascript/dashboard/components-next/sidebar/SidebarSortMenu.vue
create mode 100644 app/javascript/dashboard/helper/sidebarSort.js
create mode 100644 app/javascript/dashboard/helper/specs/sidebarSort.spec.js
create mode 100644 app/javascript/dashboard/store/modules/sidebarSortPreferences.js
create mode 100644 app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/actions.spec.js
create mode 100644 app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/getters.spec.js
create mode 100644 app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/mutations.spec.js
diff --git a/app/javascript/dashboard/components-next/dropdown-menu/DropdownMenu.vue b/app/javascript/dashboard/components-next/dropdown-menu/DropdownMenu.vue
index 8fa465704..fba446c0d 100644
--- a/app/javascript/dashboard/components-next/dropdown-menu/DropdownMenu.vue
+++ b/app/javascript/dashboard/components-next/dropdown-menu/DropdownMenu.vue
@@ -162,7 +162,7 @@ onMounted(() => {
>
-
+
{{ t('CONVERSATION_SIDEBAR.SHARED_FILES.EMPTY') }}
- -- {{ t('CONVERSATION_SIDEBAR.SHARED_FILES.MEDIA_HEADING') }} - - {{ mediaAttachments.length }} - -
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ displayDuration(attachment) }}
-
-
-
- {{ displayTime(attachment) }}
-
-
-
-
-
-
-
-
-
- {{
- t('CONVERSATION_SIDEBAR.SHARED_FILES.MORE_COUNT', {
- count: mediaOverflow,
- })
- }}
-
-
- - {{ t('CONVERSATION_SIDEBAR.SHARED_FILES.FILES_HEADING') }} - - {{ fileAttachments.length }} - -
-
+
+
+
diff --git a/app/javascript/dashboard/helper/AnalyticsHelper/events.js b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
index 751229404..58d2821ef 100644
--- a/app/javascript/dashboard/helper/AnalyticsHelper/events.js
+++ b/app/javascript/dashboard/helper/AnalyticsHelper/events.js
@@ -155,6 +155,7 @@ export const YEAR_IN_REVIEW_EVENTS = Object.freeze({
});
export const SESSION_EVENTS = Object.freeze({
+ LIMIT_HIT: 'Session limit reached at login',
REVOKED_FROM_PROFILE: 'Revoked an active session',
});
diff --git a/app/javascript/dashboard/i18n/locale/en/index.js b/app/javascript/dashboard/i18n/locale/en/index.js
index 31486a247..12db16ba7 100644
--- a/app/javascript/dashboard/i18n/locale/en/index.js
+++ b/app/javascript/dashboard/i18n/locale/en/index.js
@@ -40,6 +40,7 @@ import whatsappTemplates from './whatsappTemplates.json';
import contentTemplates from './contentTemplates.json';
import mfa from './mfa.json';
import onboarding from './onboarding.json';
+import sessionLimit from './sessionLimit.json';
import yearInReview from './yearInReview.json';
export default {
@@ -85,5 +86,6 @@ export default {
...contentTemplates,
...mfa,
...onboarding,
+ ...sessionLimit,
...yearInReview,
};
diff --git a/app/javascript/dashboard/i18n/locale/en/sessionLimit.json b/app/javascript/dashboard/i18n/locale/en/sessionLimit.json
new file mode 100644
index 000000000..926745c23
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/en/sessionLimit.json
@@ -0,0 +1,12 @@
+{
+ "SESSION_LIMIT": {
+ "TITLE": "Active session limit reached",
+ "DESCRIPTION": "You have reached your limit of active sessions. Please end a session before logging in.",
+ "END": "End",
+ "END_ALL": "End all sessions",
+ "LOG_IN": "Log in",
+ "CANCEL": "Back to login",
+ "UNKNOWN_DEVICE": "Unknown device",
+ "STARTED": "Started"
+ }
+}
diff --git a/app/javascript/v3/api/auth.js b/app/javascript/v3/api/auth.js
index 4c4ffb13e..e7f87824a 100644
--- a/app/javascript/v3/api/auth.js
+++ b/app/javascript/v3/api/auth.js
@@ -43,6 +43,15 @@ export const login = async ({
mfaToken: error.response.data.mfa_token,
};
}
+ if (
+ error.response?.status === 409 &&
+ error.response?.data?.sessions_limit_reached
+ ) {
+ return {
+ sessionsLimitReached: true,
+ sessions: error.response.data.sessions,
+ };
+ }
const loginError = new Error(parseAPIErrorResponse(error));
loginError.errorCode = error.response?.data?.error_code;
throw loginError;
diff --git a/app/javascript/v3/views/login/Index.vue b/app/javascript/v3/views/login/Index.vue
index 2f8cf70ef..54f6996a0 100644
--- a/app/javascript/v3/views/login/Index.vue
+++ b/app/javascript/v3/views/login/Index.vue
@@ -8,6 +8,8 @@ import { useVuelidate } from '@vuelidate/core';
import { SESSION_STORAGE_KEYS } from 'dashboard/constants/sessionStorage';
import SessionStorage from 'shared/helpers/sessionStorage';
import { useBranding } from 'shared/composables/useBranding';
+import AnalyticsHelper from 'dashboard/helper/AnalyticsHelper';
+import { SESSION_EVENTS } from 'dashboard/helper/AnalyticsHelper/events';
// components
import SimpleDivider from '../../components/Divider/SimpleDivider.vue';
@@ -17,6 +19,7 @@ import Spinner from 'shared/components/Spinner.vue';
import Icon from 'dashboard/components-next/icon/Icon.vue';
import NextButton from 'dashboard/components-next/button/Button.vue';
import MfaVerification from 'dashboard/components/auth/MfaVerification.vue';
+import SessionLimitOverlay from 'dashboard/components/auth/SessionLimitOverlay.vue';
const ERROR_MESSAGES = {
'no-account-found': 'LOGIN.OAUTH.NO_ACCOUNT_FOUND',
@@ -36,6 +39,7 @@ export default {
NextButton,
SimpleDivider,
MfaVerification,
+ SessionLimitOverlay,
Icon,
},
props: {
@@ -68,6 +72,8 @@ export default {
error: '',
mfaRequired: false,
mfaToken: null,
+ sessionsLimitReached: false,
+ limitedSessions: [],
};
},
validations() {
@@ -182,6 +188,15 @@ export default {
return;
}
+ // Check if sessions limit reached
+ if (result?.sessionsLimitReached) {
+ this.loginApi.showLoading = false;
+ this.sessionsLimitReached = true;
+ this.limitedSessions = result.sessions;
+ AnalyticsHelper.track(SESSION_EVENTS.LIMIT_HIT);
+ return;
+ }
+
this.handleImpersonation();
this.showAlertMessage(this.$t('LOGIN.API.SUCCESS_MESSAGE'));
})
@@ -224,6 +239,51 @@ export default {
this.mfaToken = null;
this.credentials.password = '';
},
+ retryLoginWithParams(extraParams) {
+ const credentials = {
+ email: this.email
+ ? decodeURIComponent(this.email)
+ : this.credentials.email,
+ password: this.credentials.password,
+ sso_auth_token: this.ssoAuthToken,
+ ssoAccountId: this.ssoAccountId,
+ ssoConversationId: this.ssoConversationId,
+ ...extraParams,
+ };
+
+ this.sessionsLimitReached = false;
+ this.limitedSessions = [];
+ this.loginApi.showLoading = true;
+ login(credentials)
+ .then(result => {
+ if (result?.sessionsLimitReached) {
+ this.loginApi.showLoading = false;
+ this.sessionsLimitReached = true;
+ this.limitedSessions = result.sessions;
+ AnalyticsHelper.track(SESSION_EVENTS.LIMIT_HIT);
+ return;
+ }
+ this.handleImpersonation();
+ this.showAlertMessage(this.$t('LOGIN.API.SUCCESS_MESSAGE'));
+ })
+ .catch(response => {
+ this.loginApi.hasErrored = true;
+ this.showAlertMessage(
+ response?.message || this.$t('LOGIN.API.UNAUTH')
+ );
+ });
+ },
+ handleSessionRevoke(sessionId) {
+ this.retryLoginWithParams({ revoke_session_id: sessionId });
+ },
+ handleSessionRevokeAll() {
+ this.retryLoginWithParams({ revoke_all_sessions: true });
+ },
+ handleSessionLimitCancel() {
+ this.sessionsLimitReached = false;
+ this.limitedSessions = [];
+ this.credentials.password = '';
+ },
},
};
@@ -255,8 +315,18 @@ export default {
+
+
+
+
+
+
+
+
+
+
+ + {{ $t('SESSION_LIMIT.TITLE') }} +
++ {{ $t('SESSION_LIMIT.DESCRIPTION') }} +
+
+
+
+
+
+
+
+
+
+
+
+ {{ sessionLabel(session) }}
+
+
+ {{
+ `${$t('SESSION_LIMIT.STARTED')} ${formatDate(session.created_at)}, ${formatTime(session.created_at)}`
+ }}
+
+
+
+
+ {{ section.title }}
diff --git a/app/javascript/dashboard/components-next/sidebar/Sidebar.vue b/app/javascript/dashboard/components-next/sidebar/Sidebar.vue index ab037618c..15a007a74 100644 --- a/app/javascript/dashboard/components-next/sidebar/Sidebar.vue +++ b/app/javascript/dashboard/components-next/sidebar/Sidebar.vue @@ -21,6 +21,12 @@ import ChannelIcon from 'next/icon/ChannelIcon.vue'; import SidebarAccountSwitcher from './SidebarAccountSwitcher.vue'; import Logo from 'next/icon/Logo.vue'; import ComposeConversation from 'dashboard/components-next/NewConversation/ComposeConversation.vue'; +import { + SIDEBAR_SORT_SECTIONS, + getSidebarSortOptions, + resolveSidebarSort, + sortSidebarItems, +} from 'dashboard/helper/sidebarSort'; const props = defineProps({ isMobileSidebarOpen: { @@ -50,6 +56,7 @@ const { width: windowWidth } = useWindowSize(); const isMobile = computed(() => windowWidth.value < 768); const accountId = useMapGetter('getCurrentAccountId'); +const currentUserId = useMapGetter('getCurrentUserID'); const isFeatureEnabledonAccount = useMapGetter( 'accounts/isFeatureEnabledonAccount' ); @@ -79,6 +86,11 @@ const fetchConversationUnreadCounts = ([currentAccountId, isEnabled]) => { store.dispatch('conversationUnreadCounts/get'); }; +const fetchSidebarSortPreferences = ([currentAccountId, userId]) => { + if (!currentAccountId || !userId) return; + store.dispatch('sidebarSortPreferences/initialize'); +}; + const toggleShortcutModalFn = show => { if (show) { emit('openKeyShortcutModal'); @@ -192,6 +204,9 @@ const contactCustomViews = useMapGetter('customViews/getContactCustomViews'); const conversationCustomViews = useMapGetter( 'customViews/getConversationCustomViews' ); +const getSidebarSectionSort = useMapGetter( + 'sidebarSortPreferences/getSectionSort' +); onMounted(() => { store.dispatch('labels/get'); @@ -207,44 +222,62 @@ watch([accountId, hasConversationUnreadCounts], fetchConversationUnreadCounts, { immediate: true, }); -const normalizeUnreadCount = count => { - const unreadCount = Number(count); - return Number.isFinite(unreadCount) && unreadCount > 0 ? unreadCount : 0; -}; +watch([accountId, currentUserId], fetchSidebarSortPreferences, { + immediate: true, +}); -const sortByUnreadCount = (items, labelKey, unreadCountKey) => - items.slice().sort((a, b) => { - const unreadCountDiff = - normalizeUnreadCount(unreadCountKey(b)) - - normalizeUnreadCount(unreadCountKey(a)); - - if (unreadCountDiff !== 0) return unreadCountDiff; - - return labelKey(a).localeCompare(labelKey(b)); +const getSortOptionsForSection = section => + getSidebarSortOptions(section, { + hasUnreadCounts: hasConversationUnreadCounts.value, }); +const getSortForSection = section => + resolveSidebarSort(section, getSidebarSectionSort.value(section), { + hasUnreadCounts: hasConversationUnreadCounts.value, + }); + +const updateSortPreference = (section, sortBy) => { + store.dispatch('sidebarSortPreferences/setSectionSort', { + section, + sortBy, + }); +}; + +const buildSortConfig = section => ({ + sortOptions: getSortOptionsForSection(section), + activeSort: getSortForSection(section), + onSortChange: sortBy => updateSortPreference(section, sortBy), +}); + +const sortedFolders = computed(() => + sortSidebarItems(conversationCustomViews.value, { + sortBy: getSortForSection(SIDEBAR_SORT_SECTIONS.FOLDERS), + labelKey: view => view.name, + }) +); + const sortedTeams = computed(() => - sortByUnreadCount( - teams.value, - team => team.name, - team => getTeamUnreadCount.value(team.id) - ) + sortSidebarItems(teams.value, { + sortBy: getSortForSection(SIDEBAR_SORT_SECTIONS.TEAMS), + labelKey: team => team.name, + unreadCountKey: team => getTeamUnreadCount.value(team.id), + }) ); const sortedInboxes = computed(() => - sortByUnreadCount( - inboxes.value, - inbox => inbox.name, - inbox => getInboxUnreadCount.value(inbox.id) - ) + sortSidebarItems(inboxes.value, { + sortBy: getSortForSection(SIDEBAR_SORT_SECTIONS.CHANNELS), + labelKey: inbox => inbox.name, + unreadCountKey: inbox => getInboxUnreadCount.value(inbox.id), + }) ); const sortedLabels = computed(() => - sortByUnreadCount( - labels.value, - label => label.title, - label => getLabelUnreadCount.value(label.id) - ) + sortSidebarItems(labels.value, { + sortBy: getSortForSection(SIDEBAR_SORT_SECTIONS.LABELS), + labelKey: label => label.title, + unreadCountKey: label => getLabelUnreadCount.value(label.id), + }) ); const closeMobileSidebar = () => { @@ -331,9 +364,10 @@ const menuItems = computed(() => { label: t('SIDEBAR.CUSTOM_VIEWS_FOLDER'), icon: 'i-lucide-folder', activeOn: ['conversations_through_folders'], + ...buildSortConfig(SIDEBAR_SORT_SECTIONS.FOLDERS), collapsible: true, showTreeLine: true, - children: conversationCustomViews.value.map(view => ({ + children: sortedFolders.value.map(view => ({ name: `${view.name}-${view.id}`, label: view.name, to: accountScopedRoute('folder_conversations', { id: view.id }), @@ -344,6 +378,7 @@ const menuItems = computed(() => { label: t('SIDEBAR.TEAMS'), icon: 'i-lucide-users', activeOn: ['conversations_through_team'], + ...buildSortConfig(SIDEBAR_SORT_SECTIONS.TEAMS), collapsible: true, showTreeLine: true, children: sortedTeams.value.map(team => ({ @@ -358,6 +393,7 @@ const menuItems = computed(() => { label: t('SIDEBAR.CHANNELS'), icon: 'i-lucide-mailbox', activeOn: ['conversation_through_inbox'], + ...buildSortConfig(SIDEBAR_SORT_SECTIONS.CHANNELS), collapsible: true, showTreeLine: true, children: sortedInboxes.value.map(inbox => ({ @@ -380,6 +416,7 @@ const menuItems = computed(() => { label: t('SIDEBAR.LABELS'), icon: 'i-lucide-tag', activeOn: ['conversations_through_label'], + ...buildSortConfig(SIDEBAR_SORT_SECTIONS.LABELS), collapsible: true, showTreeLine: true, children: sortedLabels.value.map(label => ({ diff --git a/app/javascript/dashboard/components-next/sidebar/SidebarCollapsedPopover.vue b/app/javascript/dashboard/components-next/sidebar/SidebarCollapsedPopover.vue index 18e1aea23..2e431eb7e 100644 --- a/app/javascript/dashboard/components-next/sidebar/SidebarCollapsedPopover.vue +++ b/app/javascript/dashboard/components-next/sidebar/SidebarCollapsedPopover.vue @@ -1,11 +1,13 @@ -
-
+
-
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/sidebar/SidebarSortMenu.vue b/app/javascript/dashboard/components-next/sidebar/SidebarSortMenu.vue
new file mode 100644
index 000000000..c4e29d881
--- /dev/null
+++ b/app/javascript/dashboard/components-next/sidebar/SidebarSortMenu.vue
@@ -0,0 +1,209 @@
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/sidebar/SidebarSubGroup.vue b/app/javascript/dashboard/components-next/sidebar/SidebarSubGroup.vue
index a9f9c45e1..82005b49a 100644
--- a/app/javascript/dashboard/components-next/sidebar/SidebarSubGroup.vue
+++ b/app/javascript/dashboard/components-next/sidebar/SidebarSubGroup.vue
@@ -1,5 +1,6 @@
-
+
+
+
-
-
+ - {
+ return SIDEBAR_SORT_OPTIONS_BY_SECTION[section]?.includes(sortBy);
+};
+
+const isUnreadCountSort = sortBy => UNREAD_COUNT_SORT_OPTIONS.includes(sortBy);
+
+export const getSidebarSortOptions = (
+ section,
+ { hasUnreadCounts = true } = {}
+) => {
+ const options = SIDEBAR_SORT_OPTIONS_BY_SECTION[section] || [];
+
+ if (hasUnreadCounts) return options;
+
+ return options.filter(option => !isUnreadCountSort(option));
+};
+
+export const resolveSidebarSort = (
+ section,
+ sortBy,
+ { hasUnreadCounts = true } = {}
+) => {
+ const options = getSidebarSortOptions(section, { hasUnreadCounts });
+
+ if (options.includes(sortBy)) return sortBy;
+ if (!hasUnreadCounts && isUnreadCountSort(sortBy)) {
+ return SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC;
+ }
+
+ return options[0] || SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC;
+};
+
+export const normalizeSidebarSortPreferences = (preferences = {}) => {
+ const savedPreferences = preferences || {};
+
+ return Object.keys(DEFAULT_SIDEBAR_SORT_PREFERENCES).reduce(
+ (result, section) => {
+ const sortBy = savedPreferences[section];
+ result[section] = isValidSidebarSort(section, sortBy)
+ ? sortBy
+ : DEFAULT_SIDEBAR_SORT_PREFERENCES[section];
+ return result;
+ },
+ {}
+ );
+};
+
+const normalizeUnreadCount = count => {
+ const unreadCount = Number(count);
+ return Number.isFinite(unreadCount) && unreadCount > 0 ? unreadCount : 0;
+};
+
+const getCreatedValue = item => {
+ const createdAt = item.created_at || item.createdAt;
+
+ if (typeof createdAt === 'number') return createdAt;
+
+ if (createdAt) {
+ const timestamp = Date.parse(createdAt);
+ if (Number.isFinite(timestamp)) return timestamp;
+ }
+
+ const id = Number(item.id);
+ return Number.isFinite(id) ? id : 0;
+};
+
+const getLabelValue = (item, labelKey) => {
+ return String(labelKey(item) || '');
+};
+
+const compareAlphabetically = (a, b, labelKey) => {
+ return getLabelValue(a, labelKey).localeCompare(
+ getLabelValue(b, labelKey),
+ undefined,
+ {
+ sensitivity: 'base',
+ }
+ );
+};
+
+export const sortSidebarItems = (
+ items,
+ { sortBy, labelKey, unreadCountKey = () => 0 }
+) => {
+ return (items || []).slice().sort((a, b) => {
+ if (sortBy === SIDEBAR_SORT_KEYS.CREATED_DESC) {
+ const createdDiff = getCreatedValue(b) - getCreatedValue(a);
+ if (createdDiff !== 0) return createdDiff;
+ return compareAlphabetically(a, b, labelKey);
+ }
+
+ if (sortBy === SIDEBAR_SORT_KEYS.CREATED_ASC) {
+ const createdDiff = getCreatedValue(a) - getCreatedValue(b);
+ if (createdDiff !== 0) return createdDiff;
+ return compareAlphabetically(a, b, labelKey);
+ }
+
+ if (sortBy === SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC) {
+ return compareAlphabetically(b, a, labelKey);
+ }
+
+ if (sortBy === SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC) {
+ const unreadCountDiff =
+ normalizeUnreadCount(unreadCountKey(b)) -
+ normalizeUnreadCount(unreadCountKey(a));
+
+ if (unreadCountDiff !== 0) return unreadCountDiff;
+ }
+
+ if (sortBy === SIDEBAR_SORT_KEYS.UNREAD_COUNT_ASC) {
+ const unreadCountDiff =
+ normalizeUnreadCount(unreadCountKey(a)) -
+ normalizeUnreadCount(unreadCountKey(b));
+
+ if (unreadCountDiff !== 0) return unreadCountDiff;
+ }
+
+ return compareAlphabetically(a, b, labelKey);
+ });
+};
diff --git a/app/javascript/dashboard/helper/specs/sidebarSort.spec.js b/app/javascript/dashboard/helper/specs/sidebarSort.spec.js
new file mode 100644
index 000000000..3919252c2
--- /dev/null
+++ b/app/javascript/dashboard/helper/specs/sidebarSort.spec.js
@@ -0,0 +1,205 @@
+import {
+ DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ SIDEBAR_SORT_KEYS,
+ SIDEBAR_SORT_SECTIONS,
+ getSidebarSortOptions,
+ normalizeSidebarSortPreferences,
+ resolveSidebarSort,
+ sortSidebarItems,
+} from '../sidebarSort';
+
+const items = [
+ {
+ id: 1,
+ name: 'Billing',
+ created_at: '2024-01-01T00:00:00.000Z',
+ },
+ {
+ id: 3,
+ name: 'Accounts',
+ created_at: '2024-03-01T00:00:00.000Z',
+ },
+ {
+ id: 2,
+ name: 'Support',
+ created_at: '2024-02-01T00:00:00.000Z',
+ },
+];
+
+describe('#sortSidebarItems', () => {
+ it('sorts by created date descending', () => {
+ const sortedItems = sortSidebarItems(items, {
+ sortBy: SIDEBAR_SORT_KEYS.CREATED_DESC,
+ labelKey: item => item.name,
+ });
+
+ expect(sortedItems.map(item => item.name)).toEqual([
+ 'Accounts',
+ 'Support',
+ 'Billing',
+ ]);
+ });
+
+ it('sorts by created date ascending', () => {
+ const sortedItems = sortSidebarItems(items, {
+ sortBy: SIDEBAR_SORT_KEYS.CREATED_ASC,
+ labelKey: item => item.name,
+ });
+
+ expect(sortedItems.map(item => item.name)).toEqual([
+ 'Billing',
+ 'Support',
+ 'Accounts',
+ ]);
+ });
+
+ it('falls back to id when created date is not present', () => {
+ const sortedItems = sortSidebarItems(
+ items.map(({ created_at: _createdAt, ...item }) => item),
+ {
+ sortBy: SIDEBAR_SORT_KEYS.CREATED_DESC,
+ labelKey: item => item.name,
+ }
+ );
+
+ expect(sortedItems.map(item => item.id)).toEqual([3, 2, 1]);
+ });
+
+ it('sorts alphabetically from A to Z', () => {
+ const sortedItems = sortSidebarItems(items, {
+ sortBy: SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC,
+ labelKey: item => item.name,
+ });
+
+ expect(sortedItems.map(item => item.name)).toEqual([
+ 'Accounts',
+ 'Billing',
+ 'Support',
+ ]);
+ });
+
+ it('sorts alphabetically from Z to A', () => {
+ const sortedItems = sortSidebarItems(items, {
+ sortBy: SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+ labelKey: item => item.name,
+ });
+
+ expect(sortedItems.map(item => item.name)).toEqual([
+ 'Support',
+ 'Billing',
+ 'Accounts',
+ ]);
+ });
+
+ it('sorts by unread count descending and falls back to alphabetical order', () => {
+ const unreadCounts = {
+ 1: 3,
+ 2: 3,
+ 3: 7,
+ };
+
+ const sortedItems = sortSidebarItems(items, {
+ sortBy: SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC,
+ labelKey: item => item.name,
+ unreadCountKey: item => unreadCounts[item.id],
+ });
+
+ expect(sortedItems.map(item => item.name)).toEqual([
+ 'Accounts',
+ 'Billing',
+ 'Support',
+ ]);
+ });
+
+ it('sorts by unread count ascending and falls back to alphabetical order', () => {
+ const unreadCounts = {
+ 1: 3,
+ 2: 3,
+ 3: 7,
+ };
+
+ const sortedItems = sortSidebarItems(items, {
+ sortBy: SIDEBAR_SORT_KEYS.UNREAD_COUNT_ASC,
+ labelKey: item => item.name,
+ unreadCountKey: item => unreadCounts[item.id],
+ });
+
+ expect(sortedItems.map(item => item.name)).toEqual([
+ 'Billing',
+ 'Support',
+ 'Accounts',
+ ]);
+ });
+});
+
+describe('#normalizeSidebarSortPreferences', () => {
+ it('keeps valid preferences', () => {
+ const preferences = normalizeSidebarSortPreferences({
+ [SIDEBAR_SORT_SECTIONS.FOLDERS]: SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+ [SIDEBAR_SORT_SECTIONS.TEAMS]: SIDEBAR_SORT_KEYS.CREATED_ASC,
+ });
+
+ expect(preferences).toEqual({
+ ...DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ [SIDEBAR_SORT_SECTIONS.FOLDERS]: SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+ [SIDEBAR_SORT_SECTIONS.TEAMS]: SIDEBAR_SORT_KEYS.CREATED_ASC,
+ });
+ });
+
+ it('falls back to defaults for unsupported preferences', () => {
+ const preferences = normalizeSidebarSortPreferences({
+ [SIDEBAR_SORT_SECTIONS.FOLDERS]: SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC,
+ });
+
+ expect(preferences).toEqual(DEFAULT_SIDEBAR_SORT_PREFERENCES);
+ });
+
+ it('falls back to defaults when stored preferences are null', () => {
+ expect(normalizeSidebarSortPreferences(null)).toEqual(
+ DEFAULT_SIDEBAR_SORT_PREFERENCES
+ );
+ });
+});
+
+describe('#getSidebarSortOptions', () => {
+ it('keeps unread count options when unread counts are enabled', () => {
+ const options = getSidebarSortOptions(SIDEBAR_SORT_SECTIONS.TEAMS, {
+ hasUnreadCounts: true,
+ });
+
+ expect(options).toContain(SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC);
+ expect(options).toContain(SIDEBAR_SORT_KEYS.UNREAD_COUNT_ASC);
+ });
+
+ it('removes unread count options when unread counts are disabled', () => {
+ const options = getSidebarSortOptions(SIDEBAR_SORT_SECTIONS.TEAMS, {
+ hasUnreadCounts: false,
+ });
+
+ expect(options).not.toContain(SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC);
+ expect(options).not.toContain(SIDEBAR_SORT_KEYS.UNREAD_COUNT_ASC);
+ expect(options).toContain(SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC);
+ });
+});
+
+describe('#resolveSidebarSort', () => {
+ it('keeps unread count sort when unread counts are enabled', () => {
+ const sortBy = resolveSidebarSort(
+ SIDEBAR_SORT_SECTIONS.TEAMS,
+ SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC,
+ { hasUnreadCounts: true }
+ );
+
+ expect(sortBy).toBe(SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC);
+ });
+
+ it('falls back to alphabetical sort when unread counts are disabled', () => {
+ const sortBy = resolveSidebarSort(
+ SIDEBAR_SORT_SECTIONS.TEAMS,
+ SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC,
+ { hasUnreadCounts: false }
+ );
+
+ expect(sortBy).toBe(SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC);
+ });
+});
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index d14175cb5..5e2543698 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -390,6 +390,21 @@
"INFO_TEXT": "Let the system automatically mark you offline when you aren't using the app or dashboard.",
"INFO_SHORT": "Automatically mark offline when you aren't using the app."
},
+ "SORT_TOOLTIP": "Sort",
+ "SORT_BY": "Sort by",
+ "SORT_GROUPS": {
+ "CREATED": "Sort by date of creation",
+ "ALPHABETICAL": "Sort in alphabetical order",
+ "UNREAD_COUNT": "Sort by unread count"
+ },
+ "SORT_OPTIONS": {
+ "CREATED_DESC": "Newest first",
+ "CREATED_ASC": "Oldest first",
+ "ALPHABETICAL_ASC": "Ascending (A - Z)",
+ "ALPHABETICAL_DESC": "Descending (Z - A)",
+ "UNREAD_COUNT_DESC": "Highest first",
+ "UNREAD_COUNT_ASC": "Lowest first"
+ },
"DOCS": "Read docs",
"SECURITY": "Security",
"CAPTAIN_AI": "Captain",
diff --git a/app/javascript/dashboard/store/index.js b/app/javascript/dashboard/store/index.js
index 054a823c6..23685bfad 100755
--- a/app/javascript/dashboard/store/index.js
+++ b/app/javascript/dashboard/store/index.js
@@ -44,6 +44,7 @@ import portals from './modules/helpCenterPortals';
import reports from './modules/reports';
import sla from './modules/sla';
import slaReports from './modules/SLAReports';
+import sidebarSortPreferences from './modules/sidebarSortPreferences';
import summaryReports from './modules/summaryReports';
import teamMembers from './modules/teamMembers';
import teams from './modules/teams';
@@ -108,6 +109,7 @@ export default createStore({
reports,
sla,
slaReports,
+ sidebarSortPreferences,
summaryReports,
teamMembers,
teams,
diff --git a/app/javascript/dashboard/store/modules/sidebarSortPreferences.js b/app/javascript/dashboard/store/modules/sidebarSortPreferences.js
new file mode 100644
index 000000000..2973c80be
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/sidebarSortPreferences.js
@@ -0,0 +1,82 @@
+import { LocalStorage } from 'shared/helpers/localStorage';
+import {
+ DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ isValidSidebarSort,
+ normalizeSidebarSortPreferences,
+} from 'dashboard/helper/sidebarSort';
+
+const STORAGE_NAME = 'chatwoot_sidebar_sort_preferences';
+export const SET_SIDEBAR_SORT_PREFERENCES = 'SET_SIDEBAR_SORT_PREFERENCES';
+
+const getPreferenceScope = rootGetters => {
+ const currentUserId = rootGetters.getCurrentUserID;
+ const currentAccountId = rootGetters.getCurrentAccountId;
+
+ if (!currentUserId || !currentAccountId) return null;
+
+ return `${currentUserId}:${currentAccountId}`;
+};
+
+export const state = {
+ preferences: { ...DEFAULT_SIDEBAR_SORT_PREFERENCES },
+ storageKey: null,
+};
+
+export const getters = {
+ getSectionSort: $state => section => {
+ return (
+ $state.preferences[section] || DEFAULT_SIDEBAR_SORT_PREFERENCES[section]
+ );
+ },
+};
+
+export const actions = {
+ initialize({ commit, rootGetters }) {
+ const storageKey = getPreferenceScope(rootGetters);
+ const storedPreferences = storageKey
+ ? LocalStorage.getFromJsonStore(STORAGE_NAME, storageKey)
+ : {};
+
+ commit(SET_SIDEBAR_SORT_PREFERENCES, {
+ preferences: normalizeSidebarSortPreferences(storedPreferences),
+ storageKey,
+ });
+ },
+ setSectionSort({ commit, rootGetters, state: currentState }, payload = {}) {
+ const { section, sortBy } = payload;
+
+ if (!isValidSidebarSort(section, sortBy)) return;
+
+ const storageKey =
+ currentState.storageKey || getPreferenceScope(rootGetters);
+ const preferences = {
+ ...currentState.preferences,
+ [section]: sortBy,
+ };
+
+ commit(SET_SIDEBAR_SORT_PREFERENCES, {
+ preferences,
+ storageKey,
+ });
+
+ if (storageKey) {
+ LocalStorage.updateJsonStore(STORAGE_NAME, storageKey, preferences);
+ }
+ },
+};
+
+export const mutations = {
+ [SET_SIDEBAR_SORT_PREFERENCES]($state, payload = {}) {
+ const { preferences = {}, storageKey = null } = payload;
+ $state.preferences = normalizeSidebarSortPreferences(preferences);
+ $state.storageKey = storageKey;
+ },
+};
+
+export default {
+ namespaced: true,
+ state,
+ getters,
+ actions,
+ mutations,
+};
diff --git a/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/actions.spec.js b/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/actions.spec.js
new file mode 100644
index 000000000..7fee1d018
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/actions.spec.js
@@ -0,0 +1,106 @@
+import { LocalStorage } from 'shared/helpers/localStorage';
+import {
+ DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ SIDEBAR_SORT_KEYS,
+ SIDEBAR_SORT_SECTIONS,
+} from 'dashboard/helper/sidebarSort';
+import {
+ SET_SIDEBAR_SORT_PREFERENCES,
+ actions,
+} from '../../sidebarSortPreferences';
+
+vi.mock('shared/helpers/localStorage', () => ({
+ LocalStorage: {
+ getFromJsonStore: vi.fn(),
+ updateJsonStore: vi.fn(),
+ },
+}));
+
+const rootGetters = {
+ getCurrentUserID: 1,
+ getCurrentAccountId: 2,
+};
+
+describe('#actions', () => {
+ const commit = vi.fn();
+
+ beforeEach(() => {
+ commit.mockClear();
+ LocalStorage.getFromJsonStore.mockReset();
+ LocalStorage.updateJsonStore.mockReset();
+ });
+
+ describe('#initialize', () => {
+ it('loads scoped preferences from local storage', () => {
+ LocalStorage.getFromJsonStore.mockReturnValue({
+ [SIDEBAR_SORT_SECTIONS.FOLDERS]: SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC,
+ });
+
+ actions.initialize({ commit, rootGetters });
+
+ expect(LocalStorage.getFromJsonStore).toHaveBeenCalledWith(
+ 'chatwoot_sidebar_sort_preferences',
+ '1:2'
+ );
+ expect(commit).toHaveBeenCalledWith(SET_SIDEBAR_SORT_PREFERENCES, {
+ preferences: {
+ ...DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ [SIDEBAR_SORT_SECTIONS.FOLDERS]: SIDEBAR_SORT_KEYS.ALPHABETICAL_ASC,
+ },
+ storageKey: '1:2',
+ });
+ });
+ });
+
+ describe('#setSectionSort', () => {
+ it('persists valid preferences to local storage', () => {
+ const state = {
+ preferences: DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ storageKey: '1:2',
+ };
+
+ actions.setSectionSort(
+ { commit, rootGetters, state },
+ {
+ section: SIDEBAR_SORT_SECTIONS.LABELS,
+ sortBy: SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+ }
+ );
+
+ const preferences = {
+ ...DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ [SIDEBAR_SORT_SECTIONS.LABELS]: SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+ };
+
+ expect(commit).toHaveBeenCalledWith(SET_SIDEBAR_SORT_PREFERENCES, {
+ preferences,
+ storageKey: '1:2',
+ });
+ expect(LocalStorage.updateJsonStore).toHaveBeenCalledWith(
+ 'chatwoot_sidebar_sort_preferences',
+ '1:2',
+ preferences
+ );
+ });
+
+ it('ignores invalid preferences', () => {
+ actions.setSectionSort(
+ {
+ commit,
+ rootGetters,
+ state: {
+ preferences: DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ storageKey: '1:2',
+ },
+ },
+ {
+ section: SIDEBAR_SORT_SECTIONS.FOLDERS,
+ sortBy: SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC,
+ }
+ );
+
+ expect(commit).not.toHaveBeenCalled();
+ expect(LocalStorage.updateJsonStore).not.toHaveBeenCalled();
+ });
+ });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/getters.spec.js b/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/getters.spec.js
new file mode 100644
index 000000000..6c43e23bc
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/getters.spec.js
@@ -0,0 +1,31 @@
+import {
+ DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ SIDEBAR_SORT_KEYS,
+ SIDEBAR_SORT_SECTIONS,
+} from 'dashboard/helper/sidebarSort';
+import { getters } from '../../sidebarSortPreferences';
+
+describe('#getters', () => {
+ it('returns section sort preference', () => {
+ const state = {
+ preferences: {
+ ...DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ [SIDEBAR_SORT_SECTIONS.TEAMS]: SIDEBAR_SORT_KEYS.CREATED_ASC,
+ },
+ };
+
+ expect(getters.getSectionSort(state)(SIDEBAR_SORT_SECTIONS.TEAMS)).toBe(
+ SIDEBAR_SORT_KEYS.CREATED_ASC
+ );
+ });
+
+ it('falls back to default section sort preference', () => {
+ const state = {
+ preferences: {},
+ };
+
+ expect(getters.getSectionSort(state)(SIDEBAR_SORT_SECTIONS.LABELS)).toBe(
+ SIDEBAR_SORT_KEYS.UNREAD_COUNT_DESC
+ );
+ });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/mutations.spec.js
new file mode 100644
index 000000000..2f19c84bd
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/sidebarSortPreferences/mutations.spec.js
@@ -0,0 +1,34 @@
+import {
+ DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ SIDEBAR_SORT_KEYS,
+ SIDEBAR_SORT_SECTIONS,
+} from 'dashboard/helper/sidebarSort';
+import {
+ SET_SIDEBAR_SORT_PREFERENCES,
+ mutations,
+} from '../../sidebarSortPreferences';
+
+describe('#mutations', () => {
+ it('sets normalized preferences', () => {
+ const state = {
+ preferences: {},
+ storageKey: null,
+ };
+
+ mutations[SET_SIDEBAR_SORT_PREFERENCES](state, {
+ preferences: {
+ [SIDEBAR_SORT_SECTIONS.FOLDERS]: SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+ [SIDEBAR_SORT_SECTIONS.LABELS]: 'invalid',
+ },
+ storageKey: '1:2',
+ });
+
+ expect(state).toEqual({
+ preferences: {
+ ...DEFAULT_SIDEBAR_SORT_PREFERENCES,
+ [SIDEBAR_SORT_SECTIONS.FOLDERS]: SIDEBAR_SORT_KEYS.ALPHABETICAL_DESC,
+ },
+ storageKey: '1:2',
+ });
+ });
+});
From 1713cabdf2d9b6749eb7b2da9c1263ad7058b3ab Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Tue, 16 Jun 2026 02:10:05 +0530
Subject: [PATCH 07/26] feat: Add emoji & icon picker for Help Center
categories (#14702)
---
.../api/v1/accounts/categories_controller.rb | 2 +-
app/helpers/portal_helper.rb | 12 +
.../HelpCenter/ArticleCard/ArticleCard.vue | 13 +-
.../HelpCenter/CategoryCard/CategoryCard.vue | 19 +-
.../ArticleEditorControls.vue | 26 +-
.../ArticlePage/ArticleHeaderControls.vue | 34 +-
.../Pages/ArticlePage/ArticlesPage.vue | 1 +
.../Pages/CategoryPage/CategoryDialog.vue | 4 +-
.../Pages/CategoryPage/CategoryForm.vue | 57 +-
.../CategoryPage/CategoryHeaderControls.vue | 1 +
.../Pages/CategoryPage/CategoryList.vue | 1 +
.../Pages/CategoryPage/EditCategoryDialog.vue | 4 +-
.../components/ActionButtons.vue | 10 +-
.../components-next/breadcrumb/Breadcrumb.vue | 14 +-
.../dropdown-menu/DropdownMenu.vue | 17 +-
.../emoji-icon-picker/ColorPalette.vue | 27 +
.../emoji-icon-picker/EmojiIcon.vue | 35 +
.../emoji-icon-picker/EmojiIconPicker.vue | 310 +
.../emoji-icon-picker/constants.js | 44 +
.../emoji-icon-picker/helper.js | 90 +
.../emoji-icon-picker/icons.js | 983 +++
.../components-next/tabbar/TabBar.vue | 1 +
.../widgets/conversation/ReplyBox.vue | 13 +-
.../dashboard/i18n/locale/en/emoji.json | 28 +
.../shared/components/emoji/EmojiInput.vue | 255 -
.../shared/components/emoji/emojisGroup.json | 7652 +++--------------
app/javascript/widget/assets/scss/woot.scss | 6 +
.../widget/components/ChatInputWrap.vue | 23 +-
app/javascript/widget/i18n/locale/en.json | 5 +
.../accounts/articles/_article.json.jbuilder | 2 +
.../categories/_category.json.jbuilder | 1 +
.../api/v1/portals/_category-block.html.erb | 2 +-
.../categories/_category-hero.html.erb | 2 +-
.../_article_card.html.erb | 2 +-
.../documentation_layout/_breadcrumb.html.erb | 4 +-
.../_category_card.html.erb | 2 +-
.../documentation_layout/_hero.html.erb | 2 +-
.../documentation_layout/_sidebar.html.erb | 2 +-
.../categories/_header.html.erb | 2 +-
...0610000000_add_icon_color_to_categories.rb | 5 +
db/schema.rb | 1 +
41 files changed, 3015 insertions(+), 6699 deletions(-)
create mode 100644 app/javascript/dashboard/components-next/emoji-icon-picker/ColorPalette.vue
create mode 100644 app/javascript/dashboard/components-next/emoji-icon-picker/EmojiIcon.vue
create mode 100644 app/javascript/dashboard/components-next/emoji-icon-picker/EmojiIconPicker.vue
create mode 100644 app/javascript/dashboard/components-next/emoji-icon-picker/constants.js
create mode 100644 app/javascript/dashboard/components-next/emoji-icon-picker/helper.js
create mode 100644 app/javascript/dashboard/components-next/emoji-icon-picker/icons.js
delete mode 100644 app/javascript/shared/components/emoji/EmojiInput.vue
create mode 100644 db/migrate/20260610000000_add_icon_color_to_categories.rb
diff --git a/app/controllers/api/v1/accounts/categories_controller.rb b/app/controllers/api/v1/accounts/categories_controller.rb
index 686ffaeec..655b3c890 100644
--- a/app/controllers/api/v1/accounts/categories_controller.rb
+++ b/app/controllers/api/v1/accounts/categories_controller.rb
@@ -53,7 +53,7 @@ class Api::V1::Accounts::CategoriesController < Api::V1::Accounts::BaseControlle
def category_params
params.require(:category).permit(
- :name, :description, :position, :slug, :locale, :icon, :parent_category_id, :associated_category_id
+ :name, :description, :position, :slug, :locale, :icon, :icon_color, :parent_category_id, :associated_category_id
)
end
diff --git a/app/helpers/portal_helper.rb b/app/helpers/portal_helper.rb
index 0c993ec59..31bfe8632 100644
--- a/app/helpers/portal_helper.rb
+++ b/app/helpers/portal_helper.rb
@@ -97,6 +97,18 @@ module PortalHelper
ChatwootMarkdownRenderer.new(content).render_markdown_to_plain_text
end
+ # Renders a stored category icon: a bare ri icon name (e.g. `vip-crown-2-fill/line`) saved color, or a plain emoji character.
+ def render_emoji_or_icon(value, color = nil)
+ return '' if value.blank?
+
+ # Emojis are non-ascii; bare icon names match this safe charset.
+ return ERB::Util.html_escape(value) unless value.match?(/\A[a-z][a-z0-9-]*\z/)
+
+ icon_class = value.start_with?('i-') ? value : "i-ri-#{value}"
+ style = "color: #{color};" if color.to_s.match?(/\A#\h{3,8}\z/)
+ tag.span(class: icon_class, style: style, 'aria-hidden': true)
+ end
+
def thumbnail_bg_color(username)
colors = ['#6D95BA', '#A4C3C3', '#E19191']
return colors.sample if username.blank?
diff --git a/app/javascript/dashboard/components-next/HelpCenter/ArticleCard/ArticleCard.vue b/app/javascript/dashboard/components-next/HelpCenter/ArticleCard/ArticleCard.vue
index 93ff15251..9b1c48a90 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/ArticleCard/ArticleCard.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/ArticleCard/ArticleCard.vue
@@ -13,6 +13,7 @@ import { useMapGetter } from 'dashboard/composables/store.js';
import { useConfig } from 'dashboard/composables/useConfig';
import { FEATURE_FLAGS } from 'dashboard/featureFlags';
import Icon from 'dashboard/components-next/icon/Icon.vue';
+import EmojiIcon from 'dashboard/components-next/emoji-icon-picker/EmojiIcon.vue';
import CardLayout from 'dashboard/components-next/CardLayout.vue';
import DropdownMenu from 'dashboard/components-next/dropdown-menu/DropdownMenu.vue';
import Button from 'dashboard/components-next/button/Button.vue';
@@ -131,7 +132,7 @@ const statusText = computed(() => {
const categoryName = computed(() => {
if (props.category?.slug) {
- return `${props.category.icon} ${props.category.name}`;
+ return props.category.name;
}
return t(
'HELP_CENTER.ARTICLES_PAGE.ARTICLE_CARD.CARD.CATEGORY.UNCATEGORISED'
@@ -222,7 +223,15 @@ const handleClick = id => {
{{ authorName || '-' }}
{
- return `${props.icon} ${props.title}`;
-});
-
const description = computed(() => {
return props.description ? props.description : 'No description added';
});
@@ -83,10 +84,16 @@ const handleAction = ({ action, value }) => {
- {{ categoryTitleWithIcon }}
+
{
return tabs.value.findIndex(tab => tab.value === tabParam);
});
-const activeCategoryName = computed(() => {
- const activeCategory = props.categories.find(
- category => category.slug === route.params.categorySlug
- );
+const activeCategory = computed(() =>
+ props.categories.find(category => category.slug === route.params.categorySlug)
+);
- if (activeCategory) {
- const { icon, name } = activeCategory;
- return `${icon} ${name}`;
- }
-
- return t('HELP_CENTER.ARTICLES_PAGE.ARTICLES_HEADER.CATEGORY.ALL');
-});
+const activeCategoryName = computed(
+ () =>
+ activeCategory.value?.name ||
+ t('HELP_CENTER.ARTICLES_PAGE.ARTICLES_HEADER.CATEGORY.ALL')
+);
const activeLocaleName = computed(() => {
return props.allowedLocales.find(
@@ -94,6 +92,7 @@ const categoryMenuItems = computed(() => {
value: category.slug,
action: 'filter',
emoji: category.icon,
+ iconColor: category.icon_color,
}));
const hasCategorySlug = !!route.params.categorySlug;
@@ -167,14 +166,23 @@ const handleTabChange = value => {
+ >
+
+
value: category.id,
action: 'move',
emoji: category.icon,
+ iconColor: category.icon_color,
}))
);
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryDialog.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryDialog.vue
index d71c17260..efb6be73f 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryDialog.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryDialog.vue
@@ -38,8 +38,8 @@ const { t } = useI18n();
const route = useRoute();
const handleCategory = async formData => {
- const { id, name, slug, icon, description, locale } = formData;
- const categoryData = { name, icon, slug, description };
+ const { id, name, slug, icon, iconColor, description, locale } = formData;
+ const categoryData = { name, icon, icon_color: iconColor, slug, description };
if (props.mode === 'create') {
categoryData.locale = locale;
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryForm.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryForm.vue
index d2bf42ef5..a1d5624c9 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryForm.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryForm.vue
@@ -18,6 +18,7 @@ import { convertToCategorySlug } from 'dashboard/helper/commons.js';
import Input from 'dashboard/components-next/input/Input.vue';
import TextArea from 'dashboard/components-next/textarea/TextArea.vue';
import Button from 'dashboard/components-next/button/Button.vue';
+import EmojiIcon from 'dashboard/components-next/emoji-icon-picker/EmojiIcon.vue';
const props = defineProps({
mode: {
@@ -49,8 +50,9 @@ const props = defineProps({
const emit = defineEmits(['submit', 'cancel']);
-const EmojiInput = defineAsyncComponent(
- () => import('shared/components/emoji/EmojiInput.vue')
+const EmojiIconPicker = defineAsyncComponent(
+ () =>
+ import('dashboard/components-next/emoji-icon-picker/EmojiIconPicker.vue')
);
const { t } = useI18n();
@@ -72,6 +74,7 @@ const state = reactive({
id: '',
name: '',
icon: '',
+ iconColor: '',
slug: '',
description: '',
locale: '',
@@ -109,8 +112,19 @@ const slugHelpText = computed(() => {
});
});
-const onClickInsertEmoji = emoji => {
- state.icon = emoji;
+const onSelectIcon = ({ type, value, color }) => {
+ state.icon = value;
+ state.iconColor = type === 'icon' ? color : '';
+ isEmojiPickerOpen.value = false;
+};
+
+const onColorChange = color => {
+ state.iconColor = color;
+};
+
+const onRemoveIcon = () => {
+ state.icon = '';
+ state.iconColor = '';
isEmojiPickerOpen.value = false;
};
@@ -139,7 +153,14 @@ watch(
newCategory => {
if (props.mode === 'edit' && newCategory) {
const { id, name, icon, slug, description } = newCategory;
- Object.assign(state, { id, name, icon, slug, description });
+ Object.assign(state, {
+ id,
+ name,
+ icon,
+ iconColor: newCategory.icon_color || '',
+ slug,
+ description,
+ });
}
},
{ immediate: true }
@@ -197,19 +218,29 @@ defineExpose({ state, isSubmitDisabled });
-
+
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryHeaderControls.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryHeaderControls.vue
index f25ac8027..d134f1168 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryHeaderControls.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryHeaderControls.vue
@@ -106,6 +106,7 @@ const breadcrumbItems = computed(() => {
}
),
emoji: selectedCategoryEmoji.value,
+ iconColor: selectedCategory.value?.icon_color,
});
}
return items;
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryList.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryList.vue
index 0dc0de895..45e783246 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryList.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/CategoryList.vue
@@ -68,6 +68,7 @@ watch(
:id="element.id"
:title="element.name"
:icon="element.icon"
+ :icon-color="element.icon_color"
:description="element.description"
:articles-count="element.meta?.articles_count || 0"
:slug="element.slug"
diff --git a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/EditCategoryDialog.vue b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/EditCategoryDialog.vue
index 5b339e568..2456ce596 100644
--- a/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/EditCategoryDialog.vue
+++ b/app/javascript/dashboard/components-next/HelpCenter/Pages/CategoryPage/EditCategoryDialog.vue
@@ -52,8 +52,8 @@ const activeLocaleCode = computed(() => activeLocale.value?.code ?? '');
const onUpdateCategory = async () => {
if (!categoryFormRef.value) return;
const { state } = categoryFormRef.value;
- const { id, name, slug, icon, description } = state;
- const categoryData = { name, icon, slug, description };
+ const { id, name, slug, icon, iconColor, description } = state;
+ const categoryData = { name, icon, icon_color: iconColor, slug, description };
categoryData.id = id;
try {
diff --git a/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue b/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
index 22c142322..e488ee107 100644
--- a/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
+++ b/app/javascript/dashboard/components-next/NewConversation/components/ActionButtons.vue
@@ -53,8 +53,9 @@ const generateUid = () => {
const uploadAttachment = ref(null);
const isEmojiPickerOpen = ref(false);
-const EmojiInput = defineAsyncComponent(
- () => import('shared/components/emoji/EmojiInput.vue')
+const EmojiIconPicker = defineAsyncComponent(
+ () =>
+ import('dashboard/components-next/emoji-icon-picker/EmojiIconPicker.vue')
);
const {
@@ -215,10 +216,11 @@ useEventListener(document, 'paste', onPaste);
class="!w-10"
@click="isEmojiPickerOpen = !isEmojiPickerOpen"
/>
-
{
-
- {{ item.emoji ? item.emoji : '' }} {{ item.label }}
+
+
{
class="flex-shrink-0 size-3.5"
/>
- {{ item.emoji }}
+
+import { useI18n } from 'vue-i18n';
+import { ICON_COLORS } from './constants';
+
+const { t } = useI18n();
+const selectedColor = defineModel({ type: String, default: '' });
+
+
+
+
-import emojis from './emojisGroup.json';
-import FluentIcon from 'shared/components/FluentIcon/Index.vue';
-import NextButton from 'dashboard/components-next/button/Button.vue';
-const SEARCH_KEY = 'Search';
-
-export default {
- components: { FluentIcon, NextButton },
- props: {
- onClick: {
- type: Function,
- default: () => {},
- },
- showRemoveButton: {
- type: Boolean,
- default: false,
- },
- },
- data() {
- return {
- selectedKey: 'Search',
- emojis,
- search: '',
- };
- },
- computed: {
- categories() {
- return [...this.emojis];
- },
- filterEmojisByCategory() {
- const selectedCategoryName = this.emojis.find(category =>
- category.name === this.selectedKey ? category.name : null
- );
- return selectedCategoryName?.emojis;
- },
- filterAllEmojisBySearch() {
- return this.emojis.map(category => {
- const allEmojis = category.emojis.filter(emoji =>
- emoji.slug.replaceAll('_', ' ').includes(this.search.toLowerCase())
- );
- return allEmojis.length > 0
- ? { ...category, emojis: allEmojis }
- : { ...category, emojis: [] };
- });
- },
- hasNoSearch() {
- return this.selectedKey !== SEARCH_KEY && this.search === '';
- },
- hasEmptySearchResult() {
- return this.filterAllEmojisBySearch.every(
- category => category.emojis.length === 0
- );
- },
- },
- watch: {
- search() {
- this.selectedKey = 'Search';
- },
- selectedKey() {
- return this.selectedKey === 'Search' ? this.focusSearchInput() : null;
- },
- },
- mounted() {
- this.focusSearchInput();
- },
- methods: {
- changeCategory(category) {
- this.search = '';
- this.$refs.emojiItem.scrollTo({ top: 0 });
- this.selectedKey = category;
- },
- getFirstEmojiByCategoryName(categoryName) {
- const categoryItem = this.emojis.find(category =>
- category.name === categoryName ? category : null
- );
- return categoryItem ? categoryItem.emojis[0].emoji : '';
- },
- focusSearchInput() {
- this.$nextTick(() => {
- this.$refs.searchbar.focus();
- });
- },
- },
-};
-
-
-
-
+
+
+
diff --git a/app/javascript/dashboard/components-next/emoji-icon-picker/EmojiIcon.vue b/app/javascript/dashboard/components-next/emoji-icon-picker/EmojiIcon.vue
new file mode 100644
index 000000000..c4ca21be5
--- /dev/null
+++ b/app/javascript/dashboard/components-next/emoji-icon-picker/EmojiIcon.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
diff --git a/app/javascript/dashboard/components-next/emoji-icon-picker/constants.js b/app/javascript/dashboard/components-next/emoji-icon-picker/constants.js
new file mode 100644
index 000000000..d8226db3e
--- /dev/null
+++ b/app/javascript/dashboard/components-next/emoji-icon-picker/constants.js
@@ -0,0 +1,44 @@
+// Prefix that turns a stored icon name (e.g. "rocket-line") into a class.
+// Swapping icon libraries means changing this and the curated set only.
+export const ICON_PREFIX = 'i-ri-';
+
+export const ICON_STYLE = {
+ LINE: 'line',
+ FILL: 'fill',
+};
+
+// Icon values are ascii names (e.g. "rocket-line"); emoji are non-ascii.
+export const isIconValue = value =>
+ typeof value === 'string' && /^[a-z][a-z0-9-]*$/.test(value);
+
+export const iconClassFor = value =>
+ value.startsWith(ICON_PREFIX) ? value : `${ICON_PREFIX}${value}`;
+
+export const ICON_COLORS = [
+ { name: 'SLATE', value: '#64748B' },
+ { name: 'RED', value: '#EF4444' },
+ { name: 'ORANGE', value: '#F97316' },
+ { name: 'AMBER', value: '#F59E0B' },
+ { name: 'GREEN', value: '#22C55E' },
+ { name: 'TEAL', value: '#14B8A6' },
+ { name: 'BLUE', value: '#3B82F6' },
+ { name: 'INDIGO', value: '#6366F1' },
+ { name: 'VIOLET', value: '#8B5CF6' },
+ { name: 'PINK', value: '#EC4899' },
+];
+
+export const DEFAULT_ICON_COLOR = '#3B82F6';
+
+// Recently used emojis persisted in localStorage.
+export const RECENT_EMOJI_KEY = 'emoji-icon-picker.recent-emojis';
+export const MAX_RECENT_EMOJIS = 16;
+
+export const PICKER_MODE = {
+ BOTH: 'both',
+ EMOJI: 'emoji',
+};
+
+export const PICKER_TAB = {
+ ICONS: 'icons',
+ EMOJIS: 'emojis',
+};
diff --git a/app/javascript/dashboard/components-next/emoji-icon-picker/helper.js b/app/javascript/dashboard/components-next/emoji-icon-picker/helper.js
new file mode 100644
index 000000000..03e8ec5e0
--- /dev/null
+++ b/app/javascript/dashboard/components-next/emoji-icon-picker/helper.js
@@ -0,0 +1,90 @@
+import emojiGroups from 'shared/components/emoji/emojisGroup.json';
+import { MAX_RECENT_EMOJIS, RECENT_EMOJI_KEY } from './constants';
+
+const matchesSearch = (emoji, term) =>
+ emoji.slug.replaceAll('_', ' ').includes(term) ||
+ emoji.name.toLowerCase().includes(term);
+
+// Emoji sections for the search term; prepends "Frequently used" when idle.
+export const buildEmojiSections = (search, recentEmojis, frequentLabel) => {
+ const term = search.trim().toLowerCase();
+ if (term) {
+ return emojiGroups
+ .map(({ name, emojis }) => ({
+ name,
+ emojis: emojis.filter(e => matchesSearch(e, term)),
+ }))
+ .filter(group => group.emojis.length);
+ }
+ return [
+ ...(recentEmojis.length
+ ? [{ name: frequentLabel, emojis: recentEmojis }]
+ : []),
+ ...emojiGroups,
+ ];
+};
+
+// Samples an emoji's average color (via canvas) as a translucent hover tint. Cached per emoji.
+const emojiTintCache = new Map();
+const NEUTRAL_TINT = 'rgb(var(--slate-9) / 0.12)';
+
+const sampleEmojiTint = emoji => {
+ const canvas = Object.assign(document.createElement('canvas'), {
+ width: 16,
+ height: 16,
+ });
+ const ctx = canvas.getContext('2d', { willReadFrequently: true });
+ ctx.font = '14px serif';
+ ctx.textAlign = 'center';
+ ctx.textBaseline = 'middle';
+ ctx.fillText(emoji, 8, 9);
+
+ const { data } = ctx.getImageData(0, 0, 16, 16);
+ const pixels = Array.from(
+ { length: data.length / 4 },
+ (_, i) => i * 4
+ ).filter(i => data[i + 3] > 16);
+ if (!pixels.length) return NEUTRAL_TINT;
+
+ const avg = offset =>
+ Math.round(
+ pixels.reduce((sum, i) => sum + data[i + offset], 0) / pixels.length
+ );
+
+ return `rgba(${avg(0)}, ${avg(1)}, ${avg(2)}, 0.16)`;
+};
+
+export const getEmojiTint = emoji => {
+ if (!emojiTintCache.has(emoji)) {
+ let tint = NEUTRAL_TINT;
+ try {
+ tint = sampleEmojiTint(emoji);
+ } catch {
+ /* canvas unavailable */
+ }
+ emojiTintCache.set(emoji, tint);
+ }
+ return emojiTintCache.get(emoji);
+};
+
+export const getRecentEmojis = () => {
+ try {
+ const stored = JSON.parse(localStorage.getItem(RECENT_EMOJI_KEY) ?? '[]');
+ return Array.isArray(stored) ? stored : [];
+ } catch {
+ return [];
+ }
+};
+
+export const addRecentEmoji = emoji => {
+ const updated = [
+ emoji,
+ ...getRecentEmojis().filter(item => item.slug !== emoji.slug),
+ ].slice(0, MAX_RECENT_EMOJIS);
+ try {
+ localStorage.setItem(RECENT_EMOJI_KEY, JSON.stringify(updated));
+ } catch {
+ /* private mode; recents are best-effort */
+ }
+ return updated;
+};
diff --git a/app/javascript/dashboard/components-next/emoji-icon-picker/icons.js b/app/javascript/dashboard/components-next/emoji-icon-picker/icons.js
new file mode 100644
index 000000000..3cf0d7b3d
--- /dev/null
+++ b/app/javascript/dashboard/components-next/emoji-icon-picker/icons.js
@@ -0,0 +1,983 @@
+// Curated Remix (ri) icons, each with a `line` and `fill` class. The class
+// literals are kept here so Tailwind generates them. { name, keywords, line, fill }
+
+export const CURATED_ICONS = [
+ {
+ name: 'home',
+ keywords: 'home house main',
+ line: 'i-ri-home-line',
+ fill: 'i-ri-home-fill',
+ },
+ {
+ name: 'star',
+ keywords: 'favorite star',
+ line: 'i-ri-star-line',
+ fill: 'i-ri-star-fill',
+ },
+ {
+ name: 'heart',
+ keywords: 'like love',
+ line: 'i-ri-heart-line',
+ fill: 'i-ri-heart-fill',
+ },
+ {
+ name: 'bookmark',
+ keywords: 'save',
+ line: 'i-ri-bookmark-line',
+ fill: 'i-ri-bookmark-fill',
+ },
+ {
+ name: 'flag-2',
+ keywords: 'flag report',
+ line: 'i-ri-flag-2-line',
+ fill: 'i-ri-flag-2-fill',
+ },
+ {
+ name: 'price-tag-3',
+ keywords: 'tag label',
+ line: 'i-ri-price-tag-3-line',
+ fill: 'i-ri-price-tag-3-fill',
+ },
+ {
+ name: 'map-pin',
+ keywords: 'location place',
+ line: 'i-ri-map-pin-line',
+ fill: 'i-ri-map-pin-fill',
+ },
+ {
+ name: 'sparkling-2',
+ keywords: 'magic ai shine sparkle',
+ line: 'i-ri-sparkling-2-line',
+ fill: 'i-ri-sparkling-2-fill',
+ },
+ {
+ name: 'fire',
+ keywords: 'flame hot trending',
+ line: 'i-ri-fire-line',
+ fill: 'i-ri-fire-fill',
+ },
+ {
+ name: 'lightbulb',
+ keywords: 'idea tip',
+ line: 'i-ri-lightbulb-line',
+ fill: 'i-ri-lightbulb-fill',
+ },
+ {
+ name: 'rocket',
+ keywords: 'launch startup ship',
+ line: 'i-ri-rocket-line',
+ fill: 'i-ri-rocket-fill',
+ },
+ {
+ name: 'focus-3',
+ keywords: 'target goal aim',
+ line: 'i-ri-focus-3-line',
+ fill: 'i-ri-focus-3-fill',
+ },
+ {
+ name: 'award',
+ keywords: 'prize badge medal',
+ line: 'i-ri-award-line',
+ fill: 'i-ri-award-fill',
+ },
+ {
+ name: 'trophy',
+ keywords: 'win achievement',
+ line: 'i-ri-trophy-line',
+ fill: 'i-ri-trophy-fill',
+ },
+ {
+ name: 'vip-crown-2',
+ keywords: 'crown premium vip',
+ line: 'i-ri-vip-crown-2-line',
+ fill: 'i-ri-vip-crown-2-fill',
+ },
+ {
+ name: 'vip-diamond',
+ keywords: 'gem diamond premium',
+ line: 'i-ri-vip-diamond-line',
+ fill: 'i-ri-vip-diamond-fill',
+ },
+ {
+ name: 'gift',
+ keywords: 'present reward',
+ line: 'i-ri-gift-line',
+ fill: 'i-ri-gift-fill',
+ },
+ {
+ name: 'notification-3',
+ keywords: 'bell alert',
+ line: 'i-ri-notification-3-line',
+ fill: 'i-ri-notification-3-fill',
+ },
+ {
+ name: 'global',
+ keywords: 'globe world web',
+ line: 'i-ri-global-line',
+ fill: 'i-ri-global-fill',
+ },
+ {
+ name: 'compass-3',
+ keywords: 'explore discover',
+ line: 'i-ri-compass-3-line',
+ fill: 'i-ri-compass-3-fill',
+ },
+ {
+ name: 'puzzle-2',
+ keywords: 'extension integration',
+ line: 'i-ri-puzzle-2-line',
+ fill: 'i-ri-puzzle-2-fill',
+ },
+ {
+ name: 'ticket-2',
+ keywords: 'support coupon',
+ line: 'i-ri-ticket-2-line',
+ fill: 'i-ri-ticket-2-fill',
+ },
+ {
+ name: 'megaphone',
+ keywords: 'announce broadcast marketing',
+ line: 'i-ri-megaphone-line',
+ fill: 'i-ri-megaphone-fill',
+ },
+ {
+ name: 'briefcase-4',
+ keywords: 'work job business',
+ line: 'i-ri-briefcase-4-line',
+ fill: 'i-ri-briefcase-4-fill',
+ },
+ {
+ name: 'building-2',
+ keywords: 'company office org',
+ line: 'i-ri-building-2-line',
+ fill: 'i-ri-building-2-fill',
+ },
+ {
+ name: 'store-2',
+ keywords: 'shop commerce',
+ line: 'i-ri-store-2-line',
+ fill: 'i-ri-store-2-fill',
+ },
+ {
+ name: 'community',
+ keywords: 'group team',
+ line: 'i-ri-community-line',
+ fill: 'i-ri-community-fill',
+ },
+ {
+ name: 'folder',
+ keywords: 'directory',
+ line: 'i-ri-folder-line',
+ fill: 'i-ri-folder-fill',
+ },
+ {
+ name: 'folder-open',
+ keywords: 'directory open',
+ line: 'i-ri-folder-open-line',
+ fill: 'i-ri-folder-open-fill',
+ },
+ {
+ name: 'file',
+ keywords: 'document',
+ line: 'i-ri-file-line',
+ fill: 'i-ri-file-fill',
+ },
+ {
+ name: 'file-text',
+ keywords: 'document doc',
+ line: 'i-ri-file-text-line',
+ fill: 'i-ri-file-text-fill',
+ },
+ {
+ name: 'file-copy',
+ keywords: 'documents files',
+ line: 'i-ri-file-copy-line',
+ fill: 'i-ri-file-copy-fill',
+ },
+ {
+ name: 'clipboard',
+ keywords: 'copy tasks',
+ line: 'i-ri-clipboard-line',
+ fill: 'i-ri-clipboard-fill',
+ },
+ {
+ name: 'book-2',
+ keywords: 'read guide book',
+ line: 'i-ri-book-2-line',
+ fill: 'i-ri-book-2-fill',
+ },
+ {
+ name: 'book-open',
+ keywords: 'read guide docs',
+ line: 'i-ri-book-open-line',
+ fill: 'i-ri-book-open-fill',
+ },
+ {
+ name: 'graduation-cap',
+ keywords: 'learn course education',
+ line: 'i-ri-graduation-cap-line',
+ fill: 'i-ri-graduation-cap-fill',
+ },
+ {
+ name: 'newspaper',
+ keywords: 'news article blog',
+ line: 'i-ri-newspaper-line',
+ fill: 'i-ri-newspaper-fill',
+ },
+ {
+ name: 'sticky-note',
+ keywords: 'note memo',
+ line: 'i-ri-sticky-note-line',
+ fill: 'i-ri-sticky-note-fill',
+ },
+ {
+ name: 'pencil',
+ keywords: 'write edit',
+ line: 'i-ri-pencil-line',
+ fill: 'i-ri-pencil-fill',
+ },
+ {
+ name: 'quill-pen',
+ keywords: 'write author',
+ line: 'i-ri-quill-pen-line',
+ fill: 'i-ri-quill-pen-fill',
+ },
+ {
+ name: 'mark-pen',
+ keywords: 'highlight',
+ line: 'i-ri-mark-pen-line',
+ fill: 'i-ri-mark-pen-fill',
+ },
+ {
+ name: 'calendar-2',
+ keywords: 'date schedule calendar',
+ line: 'i-ri-calendar-2-line',
+ fill: 'i-ri-calendar-2-fill',
+ },
+ {
+ name: 'calendar-event',
+ keywords: 'schedule event',
+ line: 'i-ri-calendar-event-line',
+ fill: 'i-ri-calendar-event-fill',
+ },
+ {
+ name: 'time',
+ keywords: 'clock time',
+ line: 'i-ri-time-line',
+ fill: 'i-ri-time-fill',
+ },
+ {
+ name: 'timer',
+ keywords: 'countdown',
+ line: 'i-ri-timer-line',
+ fill: 'i-ri-timer-fill',
+ },
+ {
+ name: 'history',
+ keywords: 'recent past',
+ line: 'i-ri-history-line',
+ fill: 'i-ri-history-fill',
+ },
+ {
+ name: 'hourglass',
+ keywords: 'wait time',
+ line: 'i-ri-hourglass-line',
+ fill: 'i-ri-hourglass-fill',
+ },
+ {
+ name: 'shopping-cart-2',
+ keywords: 'buy ecommerce cart',
+ line: 'i-ri-shopping-cart-2-line',
+ fill: 'i-ri-shopping-cart-2-fill',
+ },
+ {
+ name: 'shopping-bag-3',
+ keywords: 'buy purchase bag',
+ line: 'i-ri-shopping-bag-3-line',
+ fill: 'i-ri-shopping-bag-3-fill',
+ },
+ {
+ name: 'box-3',
+ keywords: 'package box shipping',
+ line: 'i-ri-box-3-line',
+ fill: 'i-ri-box-3-fill',
+ },
+ {
+ name: 'archive',
+ keywords: 'store box archive',
+ line: 'i-ri-archive-line',
+ fill: 'i-ri-archive-fill',
+ },
+ {
+ name: 'bank-card',
+ keywords: 'pay billing card credit',
+ line: 'i-ri-bank-card-line',
+ fill: 'i-ri-bank-card-fill',
+ },
+ {
+ name: 'wallet-3',
+ keywords: 'money pay wallet',
+ line: 'i-ri-wallet-3-line',
+ fill: 'i-ri-wallet-3-fill',
+ },
+ {
+ name: 'money-dollar-circle',
+ keywords: 'money price usd',
+ line: 'i-ri-money-dollar-circle-line',
+ fill: 'i-ri-money-dollar-circle-fill',
+ },
+ {
+ name: 'copper-coin',
+ keywords: 'coins money',
+ line: 'i-ri-copper-coin-line',
+ fill: 'i-ri-copper-coin-fill',
+ },
+ {
+ name: 'currency',
+ keywords: 'money exchange',
+ line: 'i-ri-currency-line',
+ fill: 'i-ri-currency-fill',
+ },
+ {
+ name: 'receipt',
+ keywords: 'invoice bill',
+ line: 'i-ri-receipt-line',
+ fill: 'i-ri-receipt-fill',
+ },
+ {
+ name: 'percent',
+ keywords: 'discount sale',
+ line: 'i-ri-percent-line',
+ fill: 'i-ri-percent-fill',
+ },
+ {
+ name: 'calculator',
+ keywords: 'math',
+ line: 'i-ri-calculator-line',
+ fill: 'i-ri-calculator-fill',
+ },
+ {
+ name: 'mail',
+ keywords: 'email message',
+ line: 'i-ri-mail-line',
+ fill: 'i-ri-mail-fill',
+ },
+ {
+ name: 'send-plane',
+ keywords: 'send submit',
+ line: 'i-ri-send-plane-line',
+ fill: 'i-ri-send-plane-fill',
+ },
+ {
+ name: 'chat-3',
+ keywords: 'chat talk message',
+ line: 'i-ri-chat-3-line',
+ fill: 'i-ri-chat-3-fill',
+ },
+ {
+ name: 'message-2',
+ keywords: 'chat comment',
+ line: 'i-ri-message-2-line',
+ fill: 'i-ri-message-2-fill',
+ },
+ {
+ name: 'question-answer',
+ keywords: 'chat conversation faq',
+ line: 'i-ri-question-answer-line',
+ fill: 'i-ri-question-answer-fill',
+ },
+ {
+ name: 'phone',
+ keywords: 'call',
+ line: 'i-ri-phone-line',
+ fill: 'i-ri-phone-fill',
+ },
+ {
+ name: 'vidicon',
+ keywords: 'video call meeting',
+ line: 'i-ri-vidicon-line',
+ fill: 'i-ri-vidicon-fill',
+ },
+ {
+ name: 'mic',
+ keywords: 'record voice audio',
+ line: 'i-ri-mic-line',
+ fill: 'i-ri-mic-fill',
+ },
+ {
+ name: 'group',
+ keywords: 'team people users',
+ line: 'i-ri-group-line',
+ fill: 'i-ri-group-fill',
+ },
+ {
+ name: 'user',
+ keywords: 'person account',
+ line: 'i-ri-user-line',
+ fill: 'i-ri-user-fill',
+ },
+ {
+ name: 'user-add',
+ keywords: 'add member',
+ line: 'i-ri-user-add-line',
+ fill: 'i-ri-user-add-fill',
+ },
+ {
+ name: 'contacts',
+ keywords: 'person card contact',
+ line: 'i-ri-contacts-line',
+ fill: 'i-ri-contacts-fill',
+ },
+ {
+ name: 'emotion-happy',
+ keywords: 'happy smile emoji',
+ line: 'i-ri-emotion-happy-line',
+ fill: 'i-ri-emotion-happy-fill',
+ },
+ {
+ name: 'thumb-up',
+ keywords: 'like approve',
+ line: 'i-ri-thumb-up-line',
+ fill: 'i-ri-thumb-up-fill',
+ },
+ {
+ name: 'hand-heart',
+ keywords: 'care support',
+ line: 'i-ri-hand-heart-line',
+ fill: 'i-ri-hand-heart-fill',
+ },
+ {
+ name: 'at',
+ keywords: 'mention email at',
+ line: 'i-ri-at-line',
+ fill: 'i-ri-at-fill',
+ },
+ {
+ name: 'image-2',
+ keywords: 'picture photo image',
+ line: 'i-ri-image-2-line',
+ fill: 'i-ri-image-2-fill',
+ },
+ {
+ name: 'camera-3',
+ keywords: 'photo camera',
+ line: 'i-ri-camera-3-line',
+ fill: 'i-ri-camera-3-fill',
+ },
+ {
+ name: 'film',
+ keywords: 'movie video',
+ line: 'i-ri-film-line',
+ fill: 'i-ri-film-fill',
+ },
+ {
+ name: 'music-2',
+ keywords: 'audio song music',
+ line: 'i-ri-music-2-line',
+ fill: 'i-ri-music-2-fill',
+ },
+ {
+ name: 'headphone',
+ keywords: 'audio support',
+ line: 'i-ri-headphone-line',
+ fill: 'i-ri-headphone-fill',
+ },
+ {
+ name: 'palette',
+ keywords: 'color design art',
+ line: 'i-ri-palette-line',
+ fill: 'i-ri-palette-fill',
+ },
+ {
+ name: 'brush-3',
+ keywords: 'paint design brush',
+ line: 'i-ri-brush-3-line',
+ fill: 'i-ri-brush-3-fill',
+ },
+ {
+ name: 'scissors-2',
+ keywords: 'cut',
+ line: 'i-ri-scissors-2-line',
+ fill: 'i-ri-scissors-2-fill',
+ },
+ {
+ name: 'code-s-slash',
+ keywords: 'develop code programming',
+ line: 'i-ri-code-s-slash-line',
+ fill: 'i-ri-code-s-slash-fill',
+ },
+ {
+ name: 'terminal-box',
+ keywords: 'console cli terminal',
+ line: 'i-ri-terminal-box-line',
+ fill: 'i-ri-terminal-box-fill',
+ },
+ {
+ name: 'git-branch',
+ keywords: 'version code git',
+ line: 'i-ri-git-branch-line',
+ fill: 'i-ri-git-branch-fill',
+ },
+ {
+ name: 'github',
+ keywords: 'git code',
+ line: 'i-ri-github-line',
+ fill: 'i-ri-github-fill',
+ },
+ {
+ name: 'cpu',
+ keywords: 'chip processor',
+ line: 'i-ri-cpu-line',
+ fill: 'i-ri-cpu-fill',
+ },
+ {
+ name: 'database-2',
+ keywords: 'storage data',
+ line: 'i-ri-database-2-line',
+ fill: 'i-ri-database-2-fill',
+ },
+ {
+ name: 'server',
+ keywords: 'host backend',
+ line: 'i-ri-server-line',
+ fill: 'i-ri-server-fill',
+ },
+ {
+ name: 'cloud',
+ keywords: 'storage cloud',
+ line: 'i-ri-cloud-line',
+ fill: 'i-ri-cloud-fill',
+ },
+ {
+ name: 'wifi',
+ keywords: 'network internet',
+ line: 'i-ri-wifi-line',
+ fill: 'i-ri-wifi-fill',
+ },
+ {
+ name: 'computer',
+ keywords: 'screen desktop monitor',
+ line: 'i-ri-computer-line',
+ fill: 'i-ri-computer-fill',
+ },
+ {
+ name: 'smartphone',
+ keywords: 'mobile phone',
+ line: 'i-ri-smartphone-line',
+ fill: 'i-ri-smartphone-fill',
+ },
+ {
+ name: 'macbook',
+ keywords: 'laptop computer',
+ line: 'i-ri-macbook-line',
+ fill: 'i-ri-macbook-fill',
+ },
+ {
+ name: 'bug',
+ keywords: 'issue error bug',
+ line: 'i-ri-bug-line',
+ fill: 'i-ri-bug-fill',
+ },
+ {
+ name: 'command',
+ keywords: 'keyboard shortcut',
+ line: 'i-ri-command-line',
+ fill: 'i-ri-command-fill',
+ },
+ {
+ name: 'settings-3',
+ keywords: 'config gear options settings',
+ line: 'i-ri-settings-3-line',
+ fill: 'i-ri-settings-3-fill',
+ },
+ {
+ name: 'equalizer',
+ keywords: 'controls adjust sliders filter',
+ line: 'i-ri-equalizer-line',
+ fill: 'i-ri-equalizer-fill',
+ },
+ {
+ name: 'tools',
+ keywords: 'fix tools config',
+ line: 'i-ri-tools-line',
+ fill: 'i-ri-tools-fill',
+ },
+ {
+ name: 'hammer',
+ keywords: 'build fix hammer',
+ line: 'i-ri-hammer-line',
+ fill: 'i-ri-hammer-fill',
+ },
+ {
+ name: 'key-2',
+ keywords: 'password access key',
+ line: 'i-ri-key-2-line',
+ fill: 'i-ri-key-2-fill',
+ },
+ {
+ name: 'lock',
+ keywords: 'secure private lock',
+ line: 'i-ri-lock-line',
+ fill: 'i-ri-lock-fill',
+ },
+ {
+ name: 'lock-unlock',
+ keywords: 'open access',
+ line: 'i-ri-lock-unlock-line',
+ fill: 'i-ri-lock-unlock-fill',
+ },
+ {
+ name: 'shield',
+ keywords: 'security protect',
+ line: 'i-ri-shield-line',
+ fill: 'i-ri-shield-fill',
+ },
+ {
+ name: 'shield-check',
+ keywords: 'secure verified',
+ line: 'i-ri-shield-check-line',
+ fill: 'i-ri-shield-check-fill',
+ },
+ {
+ name: 'eye',
+ keywords: 'view visible preview',
+ line: 'i-ri-eye-line',
+ fill: 'i-ri-eye-fill',
+ },
+ {
+ name: 'search',
+ keywords: 'find lookup search',
+ line: 'i-ri-search-line',
+ fill: 'i-ri-search-fill',
+ },
+ {
+ name: 'filter-3',
+ keywords: 'sort refine filter',
+ line: 'i-ri-filter-3-line',
+ fill: 'i-ri-filter-3-fill',
+ },
+ {
+ name: 'links',
+ keywords: 'url chain link',
+ line: 'i-ri-links-line',
+ fill: 'i-ri-links-fill',
+ },
+ {
+ name: 'share-forward',
+ keywords: 'share send distribute',
+ line: 'i-ri-share-forward-line',
+ fill: 'i-ri-share-forward-fill',
+ },
+ {
+ name: 'plug',
+ keywords: 'connect integration',
+ line: 'i-ri-plug-line',
+ fill: 'i-ri-plug-fill',
+ },
+ {
+ name: 'shut-down',
+ keywords: 'power on off',
+ line: 'i-ri-shut-down-line',
+ fill: 'i-ri-shut-down-fill',
+ },
+ {
+ name: 'qr-scan-2',
+ keywords: 'qr scan',
+ line: 'i-ri-qr-scan-2-line',
+ fill: 'i-ri-qr-scan-2-fill',
+ },
+ {
+ name: 'fingerprint',
+ keywords: 'identity auth fingerprint',
+ line: 'i-ri-fingerprint-line',
+ fill: 'i-ri-fingerprint-fill',
+ },
+ {
+ name: 'bar-chart',
+ keywords: 'analytics stats graph bar',
+ line: 'i-ri-bar-chart-line',
+ fill: 'i-ri-bar-chart-fill',
+ },
+ {
+ name: 'pie-chart',
+ keywords: 'analytics stats pie',
+ line: 'i-ri-pie-chart-line',
+ fill: 'i-ri-pie-chart-fill',
+ },
+ {
+ name: 'line-chart',
+ keywords: 'analytics trend graph line',
+ line: 'i-ri-line-chart-line',
+ fill: 'i-ri-line-chart-fill',
+ },
+ {
+ name: 'stock',
+ keywords: 'growth increase trending',
+ line: 'i-ri-stock-line',
+ fill: 'i-ri-stock-fill',
+ },
+ {
+ name: 'pulse',
+ keywords: 'activity health monitor',
+ line: 'i-ri-pulse-line',
+ fill: 'i-ri-pulse-fill',
+ },
+ {
+ name: 'dashboard-3',
+ keywords: 'speed performance dashboard gauge',
+ line: 'i-ri-dashboard-3-line',
+ fill: 'i-ri-dashboard-3-fill',
+ },
+ {
+ name: 'check',
+ keywords: 'done complete ok check',
+ line: 'i-ri-check-line',
+ fill: 'i-ri-check-fill',
+ },
+ {
+ name: 'checkbox-circle',
+ keywords: 'done success check',
+ line: 'i-ri-checkbox-circle-line',
+ fill: 'i-ri-checkbox-circle-fill',
+ },
+ {
+ name: 'close-circle',
+ keywords: 'error fail close',
+ line: 'i-ri-close-circle-line',
+ fill: 'i-ri-close-circle-fill',
+ },
+ {
+ name: 'information',
+ keywords: 'info information',
+ line: 'i-ri-information-line',
+ fill: 'i-ri-information-fill',
+ },
+ {
+ name: 'error-warning',
+ keywords: 'warning alert',
+ line: 'i-ri-error-warning-line',
+ fill: 'i-ri-error-warning-fill',
+ },
+ {
+ name: 'alert',
+ keywords: 'warning caution',
+ line: 'i-ri-alert-line',
+ fill: 'i-ri-alert-fill',
+ },
+ {
+ name: 'question',
+ keywords: 'support faq help',
+ line: 'i-ri-question-line',
+ fill: 'i-ri-question-fill',
+ },
+ {
+ name: 'layout-grid',
+ keywords: 'dashboard apps grid',
+ line: 'i-ri-layout-grid-line',
+ fill: 'i-ri-layout-grid-fill',
+ },
+ {
+ name: 'table',
+ keywords: 'grid data table',
+ line: 'i-ri-table-line',
+ fill: 'i-ri-table-fill',
+ },
+ {
+ name: 'function',
+ keywords: 'kanban board',
+ line: 'i-ri-function-line',
+ fill: 'i-ri-function-fill',
+ },
+ {
+ name: 'map-2',
+ keywords: 'location navigate map',
+ line: 'i-ri-map-2-line',
+ fill: 'i-ri-map-2-fill',
+ },
+ {
+ name: 'navigation',
+ keywords: 'direction gps',
+ line: 'i-ri-navigation-line',
+ fill: 'i-ri-navigation-fill',
+ },
+ {
+ name: 'car',
+ keywords: 'drive vehicle car',
+ line: 'i-ri-car-line',
+ fill: 'i-ri-car-fill',
+ },
+ {
+ name: 'truck',
+ keywords: 'delivery shipping',
+ line: 'i-ri-truck-line',
+ fill: 'i-ri-truck-fill',
+ },
+ {
+ name: 'plane',
+ keywords: 'travel flight plane',
+ line: 'i-ri-plane-line',
+ fill: 'i-ri-plane-fill',
+ },
+ {
+ name: 'bike',
+ keywords: 'cycle bike',
+ line: 'i-ri-bike-line',
+ fill: 'i-ri-bike-fill',
+ },
+ {
+ name: 'anchor',
+ keywords: 'ship marine anchor',
+ line: 'i-ri-anchor-line',
+ fill: 'i-ri-anchor-fill',
+ },
+ {
+ name: 'leaf',
+ keywords: 'eco nature green leaf',
+ line: 'i-ri-leaf-line',
+ fill: 'i-ri-leaf-fill',
+ },
+ {
+ name: 'plant',
+ keywords: 'nature plant grow',
+ line: 'i-ri-plant-line',
+ fill: 'i-ri-plant-fill',
+ },
+ {
+ name: 'sun',
+ keywords: 'day light weather sun',
+ line: 'i-ri-sun-line',
+ fill: 'i-ri-sun-fill',
+ },
+ {
+ name: 'moon',
+ keywords: 'night dark moon',
+ line: 'i-ri-moon-line',
+ fill: 'i-ri-moon-fill',
+ },
+ {
+ name: 'rainy',
+ keywords: 'weather rain',
+ line: 'i-ri-rainy-line',
+ fill: 'i-ri-rainy-fill',
+ },
+ {
+ name: 'umbrella',
+ keywords: 'rain protect umbrella',
+ line: 'i-ri-umbrella-line',
+ fill: 'i-ri-umbrella-fill',
+ },
+ {
+ name: 'landscape',
+ keywords: 'outdoor hike mountain',
+ line: 'i-ri-landscape-line',
+ fill: 'i-ri-landscape-fill',
+ },
+ {
+ name: 'drop',
+ keywords: 'water drop',
+ line: 'i-ri-drop-line',
+ fill: 'i-ri-drop-fill',
+ },
+ {
+ name: 'cup',
+ keywords: 'coffee drink cup',
+ line: 'i-ri-cup-line',
+ fill: 'i-ri-cup-fill',
+ },
+ {
+ name: 'restaurant',
+ keywords: 'food eat restaurant',
+ line: 'i-ri-restaurant-line',
+ fill: 'i-ri-restaurant-fill',
+ },
+ {
+ name: 'cake-3',
+ keywords: 'birthday celebrate cake',
+ line: 'i-ri-cake-3-line',
+ fill: 'i-ri-cake-3-fill',
+ },
+ {
+ name: 'goblet',
+ keywords: 'drink wine bar',
+ line: 'i-ri-goblet-line',
+ fill: 'i-ri-goblet-fill',
+ },
+ {
+ name: 'heart-pulse',
+ keywords: 'health medical',
+ line: 'i-ri-heart-pulse-line',
+ fill: 'i-ri-heart-pulse-fill',
+ },
+ {
+ name: 'stethoscope',
+ keywords: 'health doctor medical',
+ line: 'i-ri-stethoscope-line',
+ fill: 'i-ri-stethoscope-fill',
+ },
+ {
+ name: 'capsule',
+ keywords: 'medicine pill health',
+ line: 'i-ri-capsule-line',
+ fill: 'i-ri-capsule-fill',
+ },
+ {
+ name: 'add',
+ keywords: 'add new create plus',
+ line: 'i-ri-add-line',
+ fill: 'i-ri-add-fill',
+ },
+ {
+ name: 'delete-bin',
+ keywords: 'delete remove trash',
+ line: 'i-ri-delete-bin-line',
+ fill: 'i-ri-delete-bin-fill',
+ },
+ {
+ name: 'download',
+ keywords: 'save export download',
+ line: 'i-ri-download-line',
+ fill: 'i-ri-download-fill',
+ },
+ {
+ name: 'upload',
+ keywords: 'import upload',
+ line: 'i-ri-upload-line',
+ fill: 'i-ri-upload-fill',
+ },
+ {
+ name: 'refresh',
+ keywords: 'reload sync update refresh',
+ line: 'i-ri-refresh-line',
+ fill: 'i-ri-refresh-fill',
+ },
+ {
+ name: 'external-link',
+ keywords: 'open new external',
+ line: 'i-ri-external-link-line',
+ fill: 'i-ri-external-link-fill',
+ },
+ {
+ name: 'logout-box',
+ keywords: 'exit signout logout',
+ line: 'i-ri-logout-box-line',
+ fill: 'i-ri-logout-box-fill',
+ },
+ {
+ name: 'fullscreen',
+ keywords: 'expand maximize fullscreen',
+ line: 'i-ri-fullscreen-line',
+ fill: 'i-ri-fullscreen-fill',
+ },
+ {
+ name: 'drag-move',
+ keywords: 'drag reorder move',
+ line: 'i-ri-drag-move-line',
+ fill: 'i-ri-drag-move-fill',
+ },
+ {
+ name: 'paint-brush',
+ keywords: 'brush paint',
+ line: 'i-ri-paint-brush-line',
+ fill: 'i-ri-paint-brush-fill',
+ },
+];
diff --git a/app/javascript/dashboard/components-next/tabbar/TabBar.vue b/app/javascript/dashboard/components-next/tabbar/TabBar.vue
index 6840bc9a9..301f51e07 100644
--- a/app/javascript/dashboard/components-next/tabbar/TabBar.vue
+++ b/app/javascript/dashboard/components-next/tabbar/TabBar.vue
@@ -81,6 +81,7 @@ const showDivider = index => {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('EMOJI_ICON_PICKER.NO_ICON') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('EMOJI_ICON_PICKER.NO_EMOJI') }}
+
+
+
-
-
-
-
-
-
diff --git a/app/javascript/shared/components/emoji/emojisGroup.json b/app/javascript/shared/components/emoji/emojisGroup.json
index ebb14ebce..090ea5762 100644
--- a/app/javascript/shared/components/emoji/emojisGroup.json
+++ b/app/javascript/shared/components/emoji/emojisGroup.json
@@ -3,11 +3,7 @@
"name": "Smileys & Emotion",
"slug": "smileys_emotion",
"emojis": [
- {
- "emoji": "😀",
- "name": "grinning face",
- "slug": "grinning_face"
- },
+ { "emoji": "😀", "name": "grinning face", "slug": "grinning_face" },
{
"emoji": "😃",
"name": "grinning face with big eyes",
@@ -48,21 +44,13 @@
"name": "slightly smiling face",
"slug": "slightly_smiling_face_smile"
},
- {
- "emoji": "🙃",
- "name": "upside-down face",
- "slug": "upside_down_face"
- },
+ { "emoji": "🙃", "name": "upside-down face", "slug": "upside_down_face" },
{
"emoji": "🫠",
"name": "melting face",
"slug": "melting_face_disappear_dissolve_melt_liquid"
},
- {
- "emoji": "😉",
- "name": "winking face",
- "slug": "winking_face"
- },
+ { "emoji": "😉", "name": "winking face", "slug": "winking_face" },
{
"emoji": "😊",
"name": "smiling face with smiling eyes",
@@ -93,11 +81,7 @@
"name": "face blowing a kiss",
"slug": "face_blowing_a_kiss"
},
- {
- "emoji": "😗",
- "name": "kissing face",
- "slug": "kissing_face"
- },
+ { "emoji": "😗", "name": "kissing face", "slug": "kissing_face" },
{
"emoji": "😚",
"name": "kissing face with closed eyes",
@@ -118,11 +102,7 @@
"name": "face savoring food",
"slug": "face_savoring_food_delicious_yum_tongue_savouring"
},
- {
- "emoji": "😛",
- "name": "face with tongue",
- "slug": "face_with_tongue"
- },
+ { "emoji": "😛", "name": "face with tongue", "slug": "face_with_tongue" },
{
"emoji": "😜",
"name": "winking face with tongue",
@@ -138,11 +118,7 @@
"name": "squinting face with tongue",
"slug": "squinting_face_with_tongue_eye_face_horrible_tongue"
},
- {
- "emoji": "🤑",
- "name": "money-mouth face",
- "slug": "money_mouth_face"
- },
+ { "emoji": "🤑", "name": "money-mouth face", "slug": "money_mouth_face" },
{
"emoji": "🤗",
"name": "smiling face with open hands",
@@ -168,11 +144,7 @@
"name": "shushing face",
"slug": "shushing_face_quiet_silence"
},
- {
- "emoji": "🤔",
- "name": "thinking face",
- "slug": "thinking_face"
- },
+ { "emoji": "🤔", "name": "thinking face", "slug": "thinking_face" },
{
"emoji": "🫡",
"name": "saluting face",
@@ -213,11 +185,7 @@
"name": "face in clouds",
"slug": "face_in_clouds_absentminded_fog"
},
- {
- "emoji": "😏",
- "name": "smirking face",
- "slug": "smirking_face"
- },
+ { "emoji": "😏", "name": "smirking face", "slug": "smirking_face" },
{
"emoji": "😒",
"name": "unamused face",
@@ -228,11 +196,7 @@
"name": "face with rolling eyes",
"slug": "face_with_rolling_eyes_eyeroll"
},
- {
- "emoji": "😬",
- "name": "grimacing face",
- "slug": "grimacing_face"
- },
+ { "emoji": "😬", "name": "grimacing face", "slug": "grimacing_face" },
{
"emoji": "😮💨",
"name": "face exhaling",
@@ -243,11 +207,7 @@
"name": "lying face",
"slug": "lying_face_lie_pinocchio"
},
- {
- "emoji": "😌",
- "name": "relieved face",
- "slug": "relieved_face"
- },
+ { "emoji": "😌", "name": "relieved face", "slug": "relieved_face" },
{
"emoji": "😔",
"name": "pensive face",
@@ -258,11 +218,7 @@
"name": "sleepy face",
"slug": "sleepy_face_good_night"
},
- {
- "emoji": "🤤",
- "name": "drooling face",
- "slug": "drooling_face"
- },
+ { "emoji": "🤤", "name": "drooling face", "slug": "drooling_face" },
{
"emoji": "😴",
"name": "sleeping face",
@@ -288,11 +244,7 @@
"name": "nauseated face",
"slug": "nauseated_face_vomit"
},
- {
- "emoji": "🤮",
- "name": "face vomiting",
- "slug": "face_vomiting_puke"
- },
+ { "emoji": "🤮", "name": "face vomiting", "slug": "face_vomiting_puke" },
{
"emoji": "🤧",
"name": "sneezing face",
@@ -348,31 +300,19 @@
"name": "smiling face with sunglasses",
"slug": "smiling_face_with_sunglasses_bright_cool_shades"
},
- {
- "emoji": "🤓",
- "name": "nerd face",
- "slug": "nerd_face_geek"
- },
+ { "emoji": "🤓", "name": "nerd face", "slug": "nerd_face_geek" },
{
"emoji": "🧐",
"name": "face with monocle",
"slug": "face_with_monocle_stuffy_wealthy"
},
- {
- "emoji": "😕",
- "name": "confused face",
- "slug": "confused_face_meh"
- },
+ { "emoji": "😕", "name": "confused face", "slug": "confused_face_meh" },
{
"emoji": "🫤",
"name": "face with diagonal mouth",
"slug": "face_with_diagonal_mouth_disappointed_meh_skeptical_unsure"
},
- {
- "emoji": "😟",
- "name": "worried face",
- "slug": "worried_face"
- },
+ { "emoji": "😟", "name": "worried face", "slug": "worried_face" },
{
"emoji": "🙁",
"name": "slightly frowning face",
@@ -393,11 +333,7 @@
"name": "astonished face",
"slug": "astonished_face_shocked_totally"
},
- {
- "emoji": "😳",
- "name": "flushed face",
- "slug": "flushed_face_dazed"
- },
+ { "emoji": "😳", "name": "flushed face", "slug": "flushed_face_dazed" },
{
"emoji": "🥺",
"name": "pleading face",
@@ -413,16 +349,8 @@
"name": "frowning face with open mouth",
"slug": "frowning_face_with_open_mouth"
},
- {
- "emoji": "😧",
- "name": "anguished face",
- "slug": "anguished_face"
- },
- {
- "emoji": "😨",
- "name": "fearful face",
- "slug": "fearful_face_scared"
- },
+ { "emoji": "😧", "name": "anguished face", "slug": "anguished_face" },
+ { "emoji": "😨", "name": "fearful face", "slug": "fearful_face_scared" },
{
"emoji": "😰",
"name": "anxious face with sweat",
@@ -448,16 +376,8 @@
"name": "face screaming in fear",
"slug": "face_screaming_in_fear_munch_scared_scream"
},
- {
- "emoji": "😖",
- "name": "confounded face",
- "slug": "confounded_face"
- },
- {
- "emoji": "😣",
- "name": "persevering face",
- "slug": "persevering_face"
- },
+ { "emoji": "😖", "name": "confounded face", "slug": "confounded_face" },
+ { "emoji": "😣", "name": "persevering face", "slug": "persevering_face" },
{
"emoji": "😞",
"name": "disappointed face",
@@ -468,16 +388,8 @@
"name": "downcast face with sweat",
"slug": "downcast_face_with_sweat_cold"
},
- {
- "emoji": "😩",
- "name": "weary face",
- "slug": "weary_face_tired"
- },
- {
- "emoji": "😫",
- "name": "tired face",
- "slug": "tired_face"
- },
+ { "emoji": "😩", "name": "weary face", "slug": "weary_face_tired" },
+ { "emoji": "😫", "name": "tired face", "slug": "tired_face" },
{
"emoji": "🥱",
"name": "yawning face",
@@ -493,11 +405,7 @@
"name": "enraged face",
"slug": "enraged_face_angry_enraged_mad_red_face"
},
- {
- "emoji": "😠",
- "name": "angry face",
- "slug": "angry_face_mad"
- },
+ { "emoji": "😠", "name": "angry face", "slug": "angry_face_mad" },
{
"emoji": "🤬",
"name": "face with symbols on mouth",
@@ -528,11 +436,7 @@
"name": "pile of poo",
"slug": "pile_of_poo_poop_dung_monster"
},
- {
- "emoji": "🤡",
- "name": "clown face",
- "slug": "clown_face"
- },
+ { "emoji": "🤡", "name": "clown face", "slug": "clown_face" },
{
"emoji": "👹",
"name": "ogre",
@@ -543,11 +447,7 @@
"name": "goblin",
"slug": "goblin_creature_fantasy_goblin_monster_face"
},
- {
- "emoji": "👻",
- "name": "ghost",
- "slug": "ghost_face_monster_fantasy"
- },
+ { "emoji": "👻", "name": "ghost", "slug": "ghost_face_monster_fantasy" },
{
"emoji": "👽",
"name": "alien",
@@ -558,11 +458,7 @@
"name": "alien monster",
"slug": "alien_monster_face_monster_creature_ufo"
},
- {
- "emoji": "🤖",
- "name": "robot",
- "slug": "robot_face_monster_robot"
- },
+ { "emoji": "🤖", "name": "robot", "slug": "robot_face_monster_robot" },
{
"emoji": "😺",
"name": "grinning cat",
@@ -603,11 +499,7 @@
"name": "crying cat",
"slug": "crying_cat_cry_sad_tear"
},
- {
- "emoji": "😾",
- "name": "pouting cat",
- "slug": "pouting_cat_face"
- },
+ { "emoji": "😾", "name": "pouting cat", "slug": "pouting_cat_face" },
{
"emoji": "🙈",
"name": "see-no-evil monkey",
@@ -623,11 +515,7 @@
"name": "speak-no-evil monkey",
"slug": "speak_no_evil_monkey_face_forbidden"
},
- {
- "emoji": "💌",
- "name": "love letter",
- "slug": "love_letter_mail"
- },
+ { "emoji": "💌", "name": "love letter", "slug": "love_letter_mail" },
{
"emoji": "💘",
"name": "heart with arrow",
@@ -653,21 +541,9 @@
"name": "beating heart",
"slug": "beating_heart_heartbeat_pulsating"
},
- {
- "emoji": "💞",
- "name": "revolving hearts",
- "slug": "revolving_hearts"
- },
- {
- "emoji": "💕",
- "name": "two hearts",
- "slug": "two_hearts_love"
- },
- {
- "emoji": "💟",
- "name": "heart decoration",
- "slug": "heart_decoration"
- },
+ { "emoji": "💞", "name": "revolving hearts", "slug": "revolving_hearts" },
+ { "emoji": "💕", "name": "two hearts", "slug": "two_hearts_love" },
+ { "emoji": "💟", "name": "heart decoration", "slug": "heart_decoration" },
{
"emoji": "❣️",
"name": "heart exclamation",
@@ -688,56 +564,16 @@
"name": "mending heart",
"slug": "mending_heart_healthier_improving_recovery_recuperating_well"
},
- {
- "emoji": "❤️",
- "name": "red heart",
- "slug": "red_heart"
- },
- {
- "emoji": "🧡",
- "name": "orange heart",
- "slug": "orange_heart"
- },
- {
- "emoji": "💛",
- "name": "yellow heart",
- "slug": "yellow_heart"
- },
- {
- "emoji": "💚",
- "name": "green heart",
- "slug": "green_heart"
- },
- {
- "emoji": "💙",
- "name": "blue heart",
- "slug": "blue_heart"
- },
- {
- "emoji": "💜",
- "name": "purple heart",
- "slug": "purple_heart"
- },
- {
- "emoji": "🤎",
- "name": "brown heart",
- "slug": "brown_heart"
- },
- {
- "emoji": "🖤",
- "name": "black heart",
- "slug": "black_heart"
- },
- {
- "emoji": "🤍",
- "name": "white heart",
- "slug": "white_heart"
- },
- {
- "emoji": "💋",
- "name": "kiss mark",
- "slug": "kiss_mark_lips"
- },
+ { "emoji": "❤️", "name": "red heart", "slug": "red_heart" },
+ { "emoji": "🧡", "name": "orange heart", "slug": "orange_heart" },
+ { "emoji": "💛", "name": "yellow heart", "slug": "yellow_heart" },
+ { "emoji": "💚", "name": "green heart", "slug": "green_heart" },
+ { "emoji": "💙", "name": "blue heart", "slug": "blue_heart" },
+ { "emoji": "💜", "name": "purple heart", "slug": "purple_heart" },
+ { "emoji": "🤎", "name": "brown heart", "slug": "brown_heart" },
+ { "emoji": "🖤", "name": "black heart", "slug": "black_heart" },
+ { "emoji": "🤍", "name": "white heart", "slug": "white_heart" },
+ { "emoji": "💋", "name": "kiss mark", "slug": "kiss_mark_lips" },
{
"emoji": "💯",
"name": "hundred points",
@@ -753,11 +589,7 @@
"name": "collision",
"slug": "collision_boom_comic_explode"
},
- {
- "emoji": "💫",
- "name": "dizzy",
- "slug": "dizzy_star_comic"
- },
+ { "emoji": "💫", "name": "dizzy", "slug": "dizzy_star_comic" },
{
"emoji": "💦",
"name": "sweat droplets",
@@ -768,11 +600,7 @@
"name": "dashing away",
"slug": "dashing_away_running_comic"
},
- {
- "emoji": "🕳️",
- "name": "hole",
- "slug": "hole"
- },
+ { "emoji": "🕳️", "name": "hole", "slug": "hole" },
{
"emoji": "💬",
"name": "speech balloon",
@@ -825,7 +653,7 @@
"slug": "hand_with_fingers_splayed"
},
{
- "emoji": "✋",
+ "emoji": "✋️",
"name": "raised hand",
"slug": "raised_hand_high_5_high_five"
},
@@ -854,11 +682,7 @@
"name": "palm up hand",
"slug": "palm_up_hand_catch_beckon_come_offer"
},
- {
- "emoji": "👌",
- "name": "OK hand",
- "slug": "ok_hand"
- },
+ { "emoji": "👌", "name": "OK hand", "slug": "ok_hand" },
{
"emoji": "🤌",
"name": "pinched fingers",
@@ -869,11 +693,7 @@
"name": "pinching hand",
"slug": "pinching_hand_small_amount"
},
- {
- "emoji": "✌️",
- "name": "victory hand",
- "slug": "victory_hand_v"
- },
+ { "emoji": "✌️", "name": "victory hand", "slug": "victory_hand_v" },
{
"emoji": "🤞",
"name": "crossed fingers",
@@ -914,11 +734,7 @@
"name": "backhand index pointing up",
"slug": "backhand_index_pointing_up_hand_point_up_finger"
},
- {
- "emoji": "🖕",
- "name": "middle finger",
- "slug": "middle_finger_hand"
- },
+ { "emoji": "🖕", "name": "middle finger", "slug": "middle_finger_hand" },
{
"emoji": "👇",
"name": "backhand index pointing down",
@@ -934,18 +750,10 @@
"name": "index pointing at the viewer",
"slug": "index_pointing_at_the_viewer_you_point"
},
+ { "emoji": "👍", "name": "thumbs up", "slug": "thumbs_up_+1_hand" },
+ { "emoji": "👎", "name": "thumbs down", "slug": "thumbs_down_-1_hand" },
{
- "emoji": "👍",
- "name": "thumbs up",
- "slug": "thumbs_up_+1_hand"
- },
- {
- "emoji": "👎",
- "name": "thumbs down",
- "slug": "thumbs_down_-1_hand"
- },
- {
- "emoji": "✊",
+ "emoji": "✊️",
"name": "raised fist",
"slug": "raised_fist_hand_punch_clenched_fist"
},
@@ -974,16 +782,8 @@
"name": "raising hands",
"slug": "raising_hands_celebration_gesture_hooray_raised_hands"
},
- {
- "emoji": "🫶",
- "name": "heart hands",
- "slug": "heart_hands_love"
- },
- {
- "emoji": "👐",
- "name": "open hands",
- "slug": "open_hands"
- },
+ { "emoji": "🫶", "name": "heart hands", "slug": "heart_hands_love" },
+ { "emoji": "👐", "name": "open hands", "slug": "open_hands" },
{
"emoji": "🤲",
"name": "palms up together",
@@ -999,46 +799,26 @@
"name": "folded hands",
"slug": "folded_hands_ask_hand_high_5_high_five_please_pray_thanks"
},
- {
- "emoji": "✍️",
- "name": "writing hand",
- "slug": "writing_hand_write"
- },
+ { "emoji": "✍️", "name": "writing hand", "slug": "writing_hand_write" },
{
"emoji": "💅",
"name": "nail polish",
"slug": "nail_polish_care_manicure_cosmetics"
},
- {
- "emoji": "🤳",
- "name": "selfie",
- "slug": "selfie_camera_phone_selfie"
- },
+ { "emoji": "🤳", "name": "selfie", "slug": "selfie_camera_phone_selfie" },
{
"emoji": "💪",
"name": "flexed biceps",
"slug": "flexed_biceps_comic_flex_muscle_strength"
},
- {
- "emoji": "🦾",
- "name": "mechanical arm",
- "slug": "mechanical_arm"
- },
+ { "emoji": "🦾", "name": "mechanical arm", "slug": "mechanical_arm" },
{
"emoji": "🦿",
"name": "mechanical leg",
"slug": "mechanical_leg_kick"
},
- {
- "emoji": "🦵",
- "name": "leg",
- "slug": "leg_kick_limb"
- },
- {
- "emoji": "🦶",
- "name": "foot",
- "slug": "foot_kick_stomp"
- },
+ { "emoji": "🦵", "name": "leg", "slug": "leg_kick_limb" },
+ { "emoji": "🦶", "name": "foot", "slug": "foot_kick_stomp" },
{
"emoji": "👂",
"name": "ear",
@@ -1049,16 +829,8 @@
"name": "ear with hearing aid",
"slug": "ear_with_hearing_aid_accessibility"
},
- {
- "emoji": "👃",
- "name": "nose",
- "slug": "nose_body"
- },
- {
- "emoji": "🧠",
- "name": "brain",
- "slug": "brain_intelligent"
- },
+ { "emoji": "👃", "name": "nose", "slug": "nose_body" },
+ { "emoji": "🧠", "name": "brain", "slug": "brain_intelligent" },
{
"emoji": "🫀",
"name": "anatomical heart",
@@ -1069,61 +841,25 @@
"name": "lungs",
"slug": "lungs_organ_exhalation_inhalation_respiration"
},
- {
- "emoji": "🦷",
- "name": "tooth",
- "slug": "tooth_dentist"
- },
- {
- "emoji": "🦴",
- "name": "bone",
- "slug": "bone_skeleton"
- },
- {
- "emoji": "👀",
- "name": "eyes",
- "slug": "eyes_face_eye"
- },
- {
- "emoji": "👁️",
- "name": "eye",
- "slug": "eye_body"
- },
- {
- "emoji": "👅",
- "name": "tongue",
- "slug": "tongue_body"
- },
- {
- "emoji": "👄",
- "name": "mouth",
- "slug": "mouth_lips"
- },
+ { "emoji": "🦷", "name": "tooth", "slug": "tooth_dentist" },
+ { "emoji": "🦴", "name": "bone", "slug": "bone_skeleton" },
+ { "emoji": "👀", "name": "eyes", "slug": "eyes_face_eye" },
+ { "emoji": "👁️", "name": "eye", "slug": "eye_body" },
+ { "emoji": "👅", "name": "tongue", "slug": "tongue_body" },
+ { "emoji": "👄", "name": "mouth", "slug": "mouth_lips" },
{
"emoji": "🫦",
"name": "biting lip",
"slug": "biting_lip_anxious_fear_flirting_nervous_uncomfortable_worried"
},
- {
- "emoji": "👶",
- "name": "baby",
- "slug": "baby_young"
- },
+ { "emoji": "👶", "name": "baby", "slug": "baby_young" },
{
"emoji": "🧒",
"name": "child",
"slug": "child_gender_neutral_young_unspecified_gender"
},
- {
- "emoji": "👦",
- "name": "boy",
- "slug": "boy_young"
- },
- {
- "emoji": "👧",
- "name": "girl",
- "slug": "girl_Virgo_young_zodiac"
- },
+ { "emoji": "👦", "name": "boy", "slug": "boy_young" },
+ { "emoji": "👧", "name": "girl", "slug": "girl_Virgo_young_zodiac" },
{
"emoji": "🧑",
"name": "person",
@@ -1134,66 +870,26 @@
"name": "person blond hair",
"slug": "person_blond_hair"
},
- {
- "emoji": "👨",
- "name": "man",
- "slug": "man_adult_man"
- },
+ { "emoji": "👨", "name": "man", "slug": "man_adult_man" },
{
"emoji": "🧔",
"name": "person beard",
"slug": "person_beard_bewhiskered"
},
- {
- "emoji": "🧔♂️",
- "name": "man beard",
- "slug": "man_beard"
- },
- {
- "emoji": "🧔♀️",
- "name": "woman beard",
- "slug": "woman_beard"
- },
- {
- "emoji": "👨🦰",
- "name": "man red hair",
- "slug": "man_red_hair"
- },
- {
- "emoji": "👨🦱",
- "name": "man curly hair",
- "slug": "man_curly_hair"
- },
- {
- "emoji": "👨🦳",
- "name": "man white hair",
- "slug": "man_white_hair"
- },
- {
- "emoji": "👨🦲",
- "name": "man bald",
- "slug": "man_bald"
- },
- {
- "emoji": "👩",
- "name": "woman",
- "slug": "woman_adult"
- },
- {
- "emoji": "👩🦰",
- "name": "woman red hair",
- "slug": "woman_red_hair"
- },
+ { "emoji": "🧔♂️", "name": "man beard", "slug": "man_beard" },
+ { "emoji": "🧔♀️", "name": "woman beard", "slug": "woman_beard" },
+ { "emoji": "👨🦰", "name": "man red hair", "slug": "man_red_hair" },
+ { "emoji": "👨🦱", "name": "man curly hair", "slug": "man_curly_hair" },
+ { "emoji": "👨🦳", "name": "man white hair", "slug": "man_white_hair" },
+ { "emoji": "👨🦲", "name": "man bald", "slug": "man_bald" },
+ { "emoji": "👩", "name": "woman", "slug": "woman_adult" },
+ { "emoji": "👩🦰", "name": "woman red hair", "slug": "woman_red_hair" },
{
"emoji": "🧑🦰",
"name": "person red hair",
"slug": "person_red_hair_unspecified_gender"
},
- {
- "emoji": "👩🦱",
- "name": "woman curly hair",
- "slug": "woman_curly_hair"
- },
+ { "emoji": "👩🦱", "name": "woman curly hair", "slug": "woman_curly_hair" },
{
"emoji": "🧑🦱",
"name": "person curly hair",
@@ -1209,51 +905,19 @@
"name": "person white hair",
"slug": "person_white_hair"
},
- {
- "emoji": "👩🦲",
- "name": "woman bald",
- "slug": "woman_bald"
- },
- {
- "emoji": "🧑🦲",
- "name": "person bald",
- "slug": "person_bald"
- },
- {
- "emoji": "👱♀️",
- "name": "woman blond hair",
- "slug": "woman_blond_hair"
- },
- {
- "emoji": "👱♂️",
- "name": "man blond hair",
- "slug": "man_blond_hair"
- },
- {
- "emoji": "🧓",
- "name": "older person",
- "slug": "older_person"
- },
- {
- "emoji": "👴",
- "name": "old man",
- "slug": "old_man"
- },
- {
- "emoji": "👵",
- "name": "old woman",
- "slug": "old_woman"
- },
+ { "emoji": "👩🦲", "name": "woman bald", "slug": "woman_bald" },
+ { "emoji": "🧑🦲", "name": "person bald", "slug": "person_bald" },
+ { "emoji": "👱♀️", "name": "woman blond hair", "slug": "woman_blond_hair" },
+ { "emoji": "👱♂️", "name": "man blond hair", "slug": "man_blond_hair" },
+ { "emoji": "🧓", "name": "older person", "slug": "older_person" },
+ { "emoji": "👴", "name": "old man", "slug": "old_man" },
+ { "emoji": "👵", "name": "old woman", "slug": "old_woman" },
{
"emoji": "🙍",
"name": "person frowning",
"slug": "person_frowning_gesture"
},
- {
- "emoji": "🙍♂️",
- "name": "man frowning",
- "slug": "man_frowning_gesture"
- },
+ { "emoji": "🙍♂️", "name": "man frowning", "slug": "man_frowning_gesture" },
{
"emoji": "🙍♀️",
"name": "woman frowning",
@@ -1264,11 +928,7 @@
"name": "person pouting",
"slug": "person_pouting_gesture"
},
- {
- "emoji": "🙎♂️",
- "name": "man pouting",
- "slug": "man_pouting_gesture"
- },
+ { "emoji": "🙎♂️", "name": "man pouting", "slug": "man_pouting_gesture" },
{
"emoji": "🙎♀️",
"name": "woman pouting",
@@ -1339,16 +999,8 @@
"name": "deaf person",
"slug": "deaf_person_ear_deafness_accessibility"
},
- {
- "emoji": "🧏♂️",
- "name": "deaf man",
- "slug": "deaf_man"
- },
- {
- "emoji": "🧏♀️",
- "name": "deaf woman",
- "slug": "deaf_woman"
- },
+ { "emoji": "🧏♂️", "name": "deaf man", "slug": "deaf_man" },
+ { "emoji": "🧏♀️", "name": "deaf woman", "slug": "deaf_woman" },
{
"emoji": "🙇",
"name": "person bowing",
@@ -1409,16 +1061,8 @@
"name": "woman health worker",
"slug": "woman_health_worker_doctor_nurse_therapist"
},
- {
- "emoji": "🧑🎓",
- "name": "student",
- "slug": "student_graduate"
- },
- {
- "emoji": "👨🎓",
- "name": "man student",
- "slug": "man_student_graduate"
- },
+ { "emoji": "🧑🎓", "name": "student", "slug": "student_graduate" },
+ { "emoji": "👨🎓", "name": "man student", "slug": "man_student_graduate" },
{
"emoji": "👩🎓",
"name": "woman student",
@@ -1439,11 +1083,7 @@
"name": "woman teacher",
"slug": "woman_teacher_instructor_professor"
},
- {
- "emoji": "🧑⚖️",
- "name": "judge",
- "slug": "judge_scales_justice"
- },
+ { "emoji": "🧑⚖️", "name": "judge", "slug": "judge_scales_justice" },
{
"emoji": "👨⚖️",
"name": "man judge",
@@ -1454,11 +1094,7 @@
"name": "woman judge",
"slug": "woman_judge_scales_justice"
},
- {
- "emoji": "🧑🌾",
- "name": "farmer",
- "slug": "farmer_gardener_rancher"
- },
+ { "emoji": "🧑🌾", "name": "farmer", "slug": "farmer_gardener_rancher" },
{
"emoji": "👨🌾",
"name": "man farmer",
@@ -1469,21 +1105,9 @@
"name": "woman farmer",
"slug": "woman_farmer_gardener_rancher"
},
- {
- "emoji": "🧑🍳",
- "name": "cook",
- "slug": "cook_chef"
- },
- {
- "emoji": "👨🍳",
- "name": "man cook",
- "slug": "man_cook"
- },
- {
- "emoji": "👩🍳",
- "name": "woman cook",
- "slug": "woman_cook"
- },
+ { "emoji": "🧑🍳", "name": "cook", "slug": "cook_chef" },
+ { "emoji": "👨🍳", "name": "man cook", "slug": "man_cook" },
+ { "emoji": "👩🍳", "name": "woman cook", "slug": "woman_cook" },
{
"emoji": "🧑🔧",
"name": "mechanic",
@@ -1574,71 +1198,23 @@
"name": "woman singer",
"slug": "woman_singer_actress_entertainer_rock_star"
},
- {
- "emoji": "🧑🎨",
- "name": "artist",
- "slug": "artist"
- },
- {
- "emoji": "👨🎨",
- "name": "man artist",
- "slug": "man_artist"
- },
- {
- "emoji": "👩🎨",
- "name": "woman artist",
- "slug": "woman_artist"
- },
- {
- "emoji": "🧑✈️",
- "name": "pilot",
- "slug": "pilot_plane"
- },
- {
- "emoji": "👨✈️",
- "name": "man pilot",
- "slug": "man_pilot"
- },
- {
- "emoji": "👩✈️",
- "name": "woman pilot",
- "slug": "woman_pilot"
- },
- {
- "emoji": "🧑🚀",
- "name": "astronaut",
- "slug": "astronaut"
- },
- {
- "emoji": "👨🚀",
- "name": "man astronaut",
- "slug": "man_astronaut"
- },
- {
- "emoji": "👩🚀",
- "name": "woman astronaut",
- "slug": "woman_astronaut"
- },
- {
- "emoji": "🧑🚒",
- "name": "firefighter",
- "slug": "firefighter"
- },
- {
- "emoji": "👨🚒",
- "name": "man firefighter",
- "slug": "man_firefighter"
- },
+ { "emoji": "🧑🎨", "name": "artist", "slug": "artist" },
+ { "emoji": "👨🎨", "name": "man artist", "slug": "man_artist" },
+ { "emoji": "👩🎨", "name": "woman artist", "slug": "woman_artist" },
+ { "emoji": "🧑✈️", "name": "pilot", "slug": "pilot_plane" },
+ { "emoji": "👨✈️", "name": "man pilot", "slug": "man_pilot" },
+ { "emoji": "👩✈️", "name": "woman pilot", "slug": "woman_pilot" },
+ { "emoji": "🧑🚀", "name": "astronaut", "slug": "astronaut" },
+ { "emoji": "👨🚀", "name": "man astronaut", "slug": "man_astronaut" },
+ { "emoji": "👩🚀", "name": "woman astronaut", "slug": "woman_astronaut" },
+ { "emoji": "🧑🚒", "name": "firefighter", "slug": "firefighter" },
+ { "emoji": "👨🚒", "name": "man firefighter", "slug": "man_firefighter" },
{
"emoji": "👩🚒",
"name": "woman firefighter",
"slug": "woman_firefighter"
},
- {
- "emoji": "👮",
- "name": "police officer",
- "slug": "police_officer_cop"
- },
+ { "emoji": "👮", "name": "police officer", "slug": "police_officer_cop" },
{
"emoji": "👮♂️",
"name": "man police officer",
@@ -1649,11 +1225,7 @@
"name": "woman police officer",
"slug": "woman_police_officer_cop"
},
- {
- "emoji": "🕵️",
- "name": "detective",
- "slug": "detective_spy_sleuth"
- },
+ { "emoji": "🕵️", "name": "detective", "slug": "detective_spy_sleuth" },
{
"emoji": "🕵️♂️",
"name": "man detective",
@@ -1664,26 +1236,10 @@
"name": "woman detective",
"slug": "woman_detective_spy_sleuth"
},
- {
- "emoji": "💂",
- "name": "guard",
- "slug": "guard"
- },
- {
- "emoji": "💂♂️",
- "name": "man guard",
- "slug": "man_guard"
- },
- {
- "emoji": "💂♀️",
- "name": "woman guard",
- "slug": "woman_guard"
- },
- {
- "emoji": "🥷",
- "name": "ninja_fighter_stealth",
- "slug": "ninja"
- },
+ { "emoji": "💂", "name": "guard", "slug": "guard" },
+ { "emoji": "💂♂️", "name": "man guard", "slug": "man_guard" },
+ { "emoji": "💂♀️", "name": "woman guard", "slug": "woman_guard" },
+ { "emoji": "🥷", "name": "ninja_fighter_stealth", "slug": "ninja" },
{
"emoji": "👷",
"name": "construction worker",
@@ -1704,16 +1260,8 @@
"name": "person with crown",
"slug": "person_with_crown"
},
- {
- "emoji": "🤴",
- "name": "prince",
- "slug": "prince"
- },
- {
- "emoji": "👸",
- "name": "princess",
- "slug": "princess"
- },
+ { "emoji": "🤴", "name": "prince", "slug": "prince" },
+ { "emoji": "👸", "name": "princess", "slug": "princess" },
{
"emoji": "👳",
"name": "person wearing turban",
@@ -1739,76 +1287,28 @@
"name": "woman with headscarf",
"slug": "woman_with_headscarf_hijab"
},
- {
- "emoji": "🤵",
- "name": "person in tuxedo",
- "slug": "person_in_tuxedo"
- },
- {
- "emoji": "🤵♂️",
- "name": "man in tuxedo",
- "slug": "man_in_tuxedo"
- },
- {
- "emoji": "🤵♀️",
- "name": "woman in tuxedo",
- "slug": "woman_in_tuxedo"
- },
- {
- "emoji": "👰",
- "name": "person with veil",
- "slug": "person_with_veil"
- },
- {
- "emoji": "👰♂️",
- "name": "man with veil",
- "slug": "man_with_veil"
- },
- {
- "emoji": "👰♀️",
- "name": "woman with veil",
- "slug": "woman_with_veil"
- },
- {
- "emoji": "🤰",
- "name": "pregnant woman",
- "slug": "pregnant_woman"
- },
- {
- "emoji": "🫃",
- "name": "pregnant man",
- "slug": "pregnant_man"
- },
- {
- "emoji": "🫄",
- "name": "pregnant person",
- "slug": "pregnant_person"
- },
- {
- "emoji": "🤱",
- "name": "breast-feeding",
- "slug": "breast_feeding"
- },
+ { "emoji": "🤵", "name": "person in tuxedo", "slug": "person_in_tuxedo" },
+ { "emoji": "🤵♂️", "name": "man in tuxedo", "slug": "man_in_tuxedo" },
+ { "emoji": "🤵♀️", "name": "woman in tuxedo", "slug": "woman_in_tuxedo" },
+ { "emoji": "👰", "name": "person with veil", "slug": "person_with_veil" },
+ { "emoji": "👰♂️", "name": "man with veil", "slug": "man_with_veil" },
+ { "emoji": "👰♀️", "name": "woman with veil", "slug": "woman_with_veil" },
+ { "emoji": "🤰", "name": "pregnant woman", "slug": "pregnant_woman" },
+ { "emoji": "🫃", "name": "pregnant man", "slug": "pregnant_man" },
+ { "emoji": "🫄", "name": "pregnant person", "slug": "pregnant_person" },
+ { "emoji": "🤱", "name": "breast-feeding", "slug": "breast_feeding" },
{
"emoji": "👩🍼",
"name": "woman feeding baby",
"slug": "woman_feeding_baby"
},
- {
- "emoji": "👨🍼",
- "name": "man feeding baby",
- "slug": "man_feeding_baby"
- },
+ { "emoji": "👨🍼", "name": "man feeding baby", "slug": "man_feeding_baby" },
{
"emoji": "🧑🍼",
"name": "person feeding baby",
"slug": "person_feeding_baby"
},
- {
- "emoji": "👼",
- "name": "baby angel",
- "slug": "baby_angel"
- },
+ { "emoji": "👼", "name": "baby angel", "slug": "baby_angel" },
{
"emoji": "🎅",
"name": "Santa Claus",
@@ -1819,26 +1319,10 @@
"name": "Mrs. Claus",
"slug": "mrs_claus_christmas_mother_santa_claus"
},
- {
- "emoji": "🧑🎄",
- "name": "mx claus",
- "slug": "mx_claus"
- },
- {
- "emoji": "🦸",
- "name": "superhero",
- "slug": "superhero"
- },
- {
- "emoji": "🦸♂️",
- "name": "man superhero",
- "slug": "man_superhero"
- },
- {
- "emoji": "🦸♀️",
- "name": "woman superhero",
- "slug": "woman_superhero"
- },
+ { "emoji": "🧑🎄", "name": "mx claus", "slug": "mx_claus" },
+ { "emoji": "🦸", "name": "superhero", "slug": "superhero" },
+ { "emoji": "🦸♂️", "name": "man superhero", "slug": "man_superhero" },
+ { "emoji": "🦸♀️", "name": "woman superhero", "slug": "woman_superhero" },
{
"emoji": "🦹",
"name": "supervillain",
@@ -1854,116 +1338,32 @@
"name": "woman supervillain",
"slug": "woman_supervillain_criminal_evil"
},
- {
- "emoji": "🧙",
- "name": "mage",
- "slug": "mage_sorceress_wizard"
- },
+ { "emoji": "🧙", "name": "mage", "slug": "mage_sorceress_wizard" },
{
"emoji": "🧙♂️",
"name": "man mage",
"slug": "man_mage_sorceress_wizard"
},
- {
- "emoji": "🧙♀️",
- "name": "woman mage",
- "slug": "witch"
- },
- {
- "emoji": "🧚",
- "name": "fairy",
- "slug": "fairy"
- },
- {
- "emoji": "🧚♂️",
- "name": "man fairy",
- "slug": "man_fairy"
- },
- {
- "emoji": "🧚♀️",
- "name": "woman fairy",
- "slug": "woman_fairy"
- },
- {
- "emoji": "🧛",
- "name": "vampire",
- "slug": "vampire"
- },
- {
- "emoji": "🧛♂️",
- "name": "man vampire",
- "slug": "man_vampire"
- },
- {
- "emoji": "🧛♀️",
- "name": "woman vampire",
- "slug": "woman_vampire"
- },
- {
- "emoji": "🧜",
- "name": "merperson",
- "slug": "merperson"
- },
- {
- "emoji": "🧜♂️",
- "name": "merman",
- "slug": "merman"
- },
- {
- "emoji": "🧜♀️",
- "name": "mermaid",
- "slug": "mermaid"
- },
- {
- "emoji": "🧝",
- "name": "elf",
- "slug": "elf"
- },
- {
- "emoji": "🧝♂️",
- "name": "man elf",
- "slug": "man_elf"
- },
- {
- "emoji": "🧝♀️",
- "name": "woman elf",
- "slug": "woman_elf"
- },
- {
- "emoji": "🧞",
- "name": "genie",
- "slug": "genie"
- },
- {
- "emoji": "🧞♂️",
- "name": "man genie",
- "slug": "man_genie"
- },
- {
- "emoji": "🧞♀️",
- "name": "woman genie",
- "slug": "woman_genie"
- },
- {
- "emoji": "🧟",
- "name": "zombie",
- "slug": "zombie"
- },
- {
- "emoji": "🧟♂️",
- "name": "man zombie",
- "slug": "man_zombie"
- },
- {
- "emoji": "🧟♀️",
- "name": "woman zombie",
- "slug": "woman_zombie"
- },
- {
- "emoji": "🧌",
- "name": "troll",
- "slug": "troll"
- },
+ { "emoji": "🧙♀️", "name": "woman mage", "slug": "witch" },
+ { "emoji": "🧚", "name": "fairy", "slug": "fairy" },
+ { "emoji": "🧚♂️", "name": "man fairy", "slug": "man_fairy" },
+ { "emoji": "🧚♀️", "name": "woman fairy", "slug": "woman_fairy" },
+ { "emoji": "🧛", "name": "vampire", "slug": "vampire" },
+ { "emoji": "🧛♂️", "name": "man vampire", "slug": "man_vampire" },
+ { "emoji": "🧛♀️", "name": "woman vampire", "slug": "woman_vampire" },
+ { "emoji": "🧜", "name": "merperson", "slug": "merperson" },
+ { "emoji": "🧜♂️", "name": "merman", "slug": "merman" },
+ { "emoji": "🧜♀️", "name": "mermaid", "slug": "mermaid" },
+ { "emoji": "🧝", "name": "elf", "slug": "elf" },
+ { "emoji": "🧝♂️", "name": "man elf", "slug": "man_elf" },
+ { "emoji": "🧝♀️", "name": "woman elf", "slug": "woman_elf" },
+ { "emoji": "🧞", "name": "genie", "slug": "genie" },
+ { "emoji": "🧞♂️", "name": "man genie", "slug": "man_genie" },
+ { "emoji": "🧞♀️", "name": "woman genie", "slug": "woman_genie" },
+ { "emoji": "🧟", "name": "zombie", "slug": "zombie" },
+ { "emoji": "🧟♂️", "name": "man zombie", "slug": "man_zombie" },
+ { "emoji": "🧟♀️", "name": "woman zombie", "slug": "woman_zombie" },
+ { "emoji": "🧌", "name": "troll", "slug": "troll" },
{
"emoji": "💆",
"name": "person getting massage",
@@ -1999,46 +1399,14 @@
"name": "person walking",
"slug": "person_walking_hike"
},
- {
- "emoji": "🚶♂️",
- "name": "man walking",
- "slug": "man_walking_hike"
- },
- {
- "emoji": "🚶♀️",
- "name": "woman walking",
- "slug": "woman_walking_hike"
- },
- {
- "emoji": "🧍",
- "name": "person standing",
- "slug": "person_standing"
- },
- {
- "emoji": "🧍♂️",
- "name": "man standing",
- "slug": "man_standing"
- },
- {
- "emoji": "🧍♀️",
- "name": "woman standing",
- "slug": "woman_standing"
- },
- {
- "emoji": "🧎",
- "name": "person kneeling",
- "slug": "person_kneeling"
- },
- {
- "emoji": "🧎♂️",
- "name": "man kneeling",
- "slug": "man_kneeling"
- },
- {
- "emoji": "🧎♀️",
- "name": "woman kneeling",
- "slug": "woman_kneeling"
- },
+ { "emoji": "🚶♂️", "name": "man walking", "slug": "man_walking_hike" },
+ { "emoji": "🚶♀️", "name": "woman walking", "slug": "woman_walking_hike" },
+ { "emoji": "🧍", "name": "person standing", "slug": "person_standing" },
+ { "emoji": "🧍♂️", "name": "man standing", "slug": "man_standing" },
+ { "emoji": "🧍♀️", "name": "woman standing", "slug": "woman_standing" },
+ { "emoji": "🧎", "name": "person kneeling", "slug": "person_kneeling" },
+ { "emoji": "🧎♂️", "name": "man kneeling", "slug": "man_kneeling" },
+ { "emoji": "🧎♀️", "name": "woman kneeling", "slug": "woman_kneeling" },
{
"emoji": "🧑🦯",
"name": "person with white cane",
@@ -2084,31 +1452,11 @@
"name": "woman in manual wheelchair",
"slug": "woman_in_manual_wheelchair_accessibility"
},
- {
- "emoji": "🏃",
- "name": "person running",
- "slug": "person_running"
- },
- {
- "emoji": "🏃♂️",
- "name": "man running",
- "slug": "man_running"
- },
- {
- "emoji": "🏃♀️",
- "name": "woman running",
- "slug": "woman_running"
- },
- {
- "emoji": "💃",
- "name": "woman dancing",
- "slug": "woman_dancing"
- },
- {
- "emoji": "🕺",
- "name": "man dancing",
- "slug": "man_dancing"
- },
+ { "emoji": "🏃", "name": "person running", "slug": "person_running" },
+ { "emoji": "🏃♂️", "name": "man running", "slug": "man_running" },
+ { "emoji": "🏃♀️", "name": "woman running", "slug": "woman_running" },
+ { "emoji": "💃", "name": "woman dancing", "slug": "woman_dancing" },
+ { "emoji": "🕺", "name": "man dancing", "slug": "man_dancing" },
{
"emoji": "🕴️",
"name": "person in suit levitating",
@@ -2144,101 +1492,33 @@
"name": "woman in steamy room",
"slug": "woman_in_steamy_room"
},
- {
- "emoji": "🧗",
- "name": "person climbing",
- "slug": "person_climbing"
- },
- {
- "emoji": "🧗♂️",
- "name": "man climbing",
- "slug": "man_climbing"
- },
- {
- "emoji": "🧗♀️",
- "name": "woman climbing",
- "slug": "woman_climbing"
- },
- {
- "emoji": "🤺",
- "name": "person fencing",
- "slug": "person_fencing"
- },
- {
- "emoji": "🏇",
- "name": "horse racing",
- "slug": "horse_racing"
- },
- {
- "emoji": "⛷️",
- "name": "skier",
- "slug": "skier"
- },
- {
- "emoji": "🏂",
- "name": "snowboarder",
- "slug": "snowboarder"
- },
- {
- "emoji": "🏌️",
- "name": "person golfing",
- "slug": "person_golfing"
- },
- {
- "emoji": "🏌️♂️",
- "name": "man golfing",
- "slug": "man_golfing"
- },
- {
- "emoji": "🏌️♀️",
- "name": "woman golfing",
- "slug": "woman_golfing"
- },
- {
- "emoji": "🏄",
- "name": "person surfing",
- "slug": "person_surfing"
- },
- {
- "emoji": "🏄♂️",
- "name": "man surfing",
- "slug": "man_surfing"
- },
- {
- "emoji": "🏄♀️",
- "name": "woman surfing",
- "slug": "woman_surfing"
- },
+ { "emoji": "🧗", "name": "person climbing", "slug": "person_climbing" },
+ { "emoji": "🧗♂️", "name": "man climbing", "slug": "man_climbing" },
+ { "emoji": "🧗♀️", "name": "woman climbing", "slug": "woman_climbing" },
+ { "emoji": "🤺", "name": "person fencing", "slug": "person_fencing" },
+ { "emoji": "🏇", "name": "horse racing", "slug": "horse_racing" },
+ { "emoji": "⛷️", "name": "skier", "slug": "skier" },
+ { "emoji": "🏂", "name": "snowboarder", "slug": "snowboarder" },
+ { "emoji": "🏌️", "name": "person golfing", "slug": "person_golfing" },
+ { "emoji": "🏌️♂️", "name": "man golfing", "slug": "man_golfing" },
+ { "emoji": "🏌️♀️", "name": "woman golfing", "slug": "woman_golfing" },
+ { "emoji": "🏄", "name": "person surfing", "slug": "person_surfing" },
+ { "emoji": "🏄♂️", "name": "man surfing", "slug": "man_surfing" },
+ { "emoji": "🏄♀️", "name": "woman surfing", "slug": "woman_surfing" },
{
"emoji": "🚣",
"name": "person rowing boat",
"slug": "person_rowing_boat"
},
- {
- "emoji": "🚣♂️",
- "name": "man rowing boat",
- "slug": "man_rowing_boat"
- },
+ { "emoji": "🚣♂️", "name": "man rowing boat", "slug": "man_rowing_boat" },
{
"emoji": "🚣♀️",
"name": "woman rowing boat",
"slug": "woman_rowing_boat"
},
- {
- "emoji": "🏊",
- "name": "person swimming",
- "slug": "person_swimming"
- },
- {
- "emoji": "🏊♂️",
- "name": "man swimming",
- "slug": "man_swimming"
- },
- {
- "emoji": "🏊♀️",
- "name": "woman swimming",
- "slug": "woman_swimming"
- },
+ { "emoji": "🏊", "name": "person swimming", "slug": "person_swimming" },
+ { "emoji": "🏊♂️", "name": "man swimming", "slug": "man_swimming" },
+ { "emoji": "🏊♀️", "name": "woman swimming", "slug": "woman_swimming" },
{
"emoji": "⛹️",
"name": "person bouncing ball",
@@ -2269,21 +1549,9 @@
"name": "woman lifting weights",
"slug": "woman_lifting_weights"
},
- {
- "emoji": "🚴",
- "name": "person biking",
- "slug": "person_biking"
- },
- {
- "emoji": "🚴♂️",
- "name": "man biking",
- "slug": "man_biking"
- },
- {
- "emoji": "🚴♀️",
- "name": "woman biking",
- "slug": "woman_biking"
- },
+ { "emoji": "🚴", "name": "person biking", "slug": "person_biking" },
+ { "emoji": "🚴♂️", "name": "man biking", "slug": "man_biking" },
+ { "emoji": "🚴♀️", "name": "woman biking", "slug": "woman_biking" },
{
"emoji": "🚵",
"name": "person mountain biking",
@@ -2304,31 +1572,15 @@
"name": "person cartwheeling",
"slug": "person_cartwheeling"
},
- {
- "emoji": "🤸♂️",
- "name": "man cartwheeling",
- "slug": "man_cartwheeling"
- },
+ { "emoji": "🤸♂️", "name": "man cartwheeling", "slug": "man_cartwheeling" },
{
"emoji": "🤸♀️",
"name": "woman cartwheeling",
"slug": "woman_cartwheeling"
},
- {
- "emoji": "🤼",
- "name": "people wrestling",
- "slug": "people_wrestling"
- },
- {
- "emoji": "🤼♂️",
- "name": "men wrestling",
- "slug": "men_wrestling"
- },
- {
- "emoji": "🤼♀️",
- "name": "women wrestling",
- "slug": "women_wrestling"
- },
+ { "emoji": "🤼", "name": "people wrestling", "slug": "people_wrestling" },
+ { "emoji": "🤼♂️", "name": "men wrestling", "slug": "men_wrestling" },
+ { "emoji": "🤼♀️", "name": "women wrestling", "slug": "women_wrestling" },
{
"emoji": "🤽",
"name": "person playing water polo",
@@ -2359,21 +1611,9 @@
"name": "woman playing handball",
"slug": "woman_playing_handball"
},
- {
- "emoji": "🤹",
- "name": "person juggling",
- "slug": "person_juggling"
- },
- {
- "emoji": "🤹♂️",
- "name": "man juggling",
- "slug": "man_juggling"
- },
- {
- "emoji": "🤹♀️",
- "name": "woman juggling",
- "slug": "woman_juggling"
- },
+ { "emoji": "🤹", "name": "person juggling", "slug": "person_juggling" },
+ { "emoji": "🤹♂️", "name": "man juggling", "slug": "man_juggling" },
+ { "emoji": "🤹♀️", "name": "woman juggling", "slug": "woman_juggling" },
{
"emoji": "🧘",
"name": "person in lotus position",
@@ -2394,11 +1634,7 @@
"name": "person taking bath",
"slug": "person_taking_bath"
},
- {
- "emoji": "🛌",
- "name": "person in bed",
- "slug": "person_in_bed"
- },
+ { "emoji": "🛌", "name": "person in bed", "slug": "person_in_bed" },
{
"emoji": "🧑🤝🧑",
"name": "people holding hands",
@@ -2419,21 +1655,9 @@
"name": "men holding hands",
"slug": "men_holding_hands"
},
- {
- "emoji": "💏",
- "name": "kiss",
- "slug": "kiss"
- },
- {
- "emoji": "👩❤️💋👨",
- "name": "kiss woman, man",
- "slug": "kiss_woman_man"
- },
- {
- "emoji": "👨❤️💋👨",
- "name": "kiss man, man",
- "slug": "kiss_man_man"
- },
+ { "emoji": "💏", "name": "kiss", "slug": "kiss" },
+ { "emoji": "👩❤️💋👨", "name": "kiss woman, man", "slug": "kiss_woman_man" },
+ { "emoji": "👨❤️💋👨", "name": "kiss man, man", "slug": "kiss_man_man" },
{
"emoji": "👩❤️💋👩",
"name": "kiss woman, woman",
@@ -2459,11 +1683,7 @@
"name": "couple with heart woman, woman",
"slug": "couple_with_heart_woman_woman"
},
- {
- "emoji": "👪",
- "name": "family",
- "slug": "family"
- },
+ { "emoji": "👪", "name": "family", "slug": "family" },
{
"emoji": "👨👩👦",
"name": "family man, woman, boy",
@@ -2539,21 +1759,13 @@
"name": "family woman, woman, girl, girl",
"slug": "family_woman_woman_girl_girl"
},
- {
- "emoji": "👨👦",
- "name": "family man, boy",
- "slug": "family_man_boy"
- },
+ { "emoji": "👨👦", "name": "family man, boy", "slug": "family_man_boy" },
{
"emoji": "👨👦👦",
"name": "family man, boy, boy",
"slug": "family_man_boy_boy"
},
- {
- "emoji": "👨👧",
- "name": "family man, girl",
- "slug": "family_man_girl"
- },
+ { "emoji": "👨👧", "name": "family man, girl", "slug": "family_man_girl" },
{
"emoji": "👨👧👦",
"name": "family man, girl, boy",
@@ -2589,11 +1801,7 @@
"name": "family woman, girl, girl",
"slug": "family_woman_girl_girl"
},
- {
- "emoji": "🗣️",
- "name": "speaking head",
- "slug": "speaking_head"
- },
+ { "emoji": "🗣️", "name": "speaking head", "slug": "speaking_head" },
{
"emoji": "👤",
"name": "bust in silhouette",
@@ -2604,1408 +1812,336 @@
"name": "busts in silhouette",
"slug": "busts_in_silhouette"
},
- {
- "emoji": "🫂",
- "name": "people hugging",
- "slug": "people_hugging"
- },
- {
- "emoji": "👣",
- "name": "footprints",
- "slug": "footprints"
- }
+ { "emoji": "🫂", "name": "people hugging", "slug": "people_hugging" },
+ { "emoji": "👣", "name": "footprints", "slug": "footprints" }
]
},
{
"name": "Animals & Nature",
"slug": "animals_nature",
"emojis": [
- {
- "emoji": "🐵",
- "name": "monkey face",
- "slug": "monkey_face"
- },
- {
- "emoji": "🐒",
- "name": "monkey",
- "slug": "monkey"
- },
- {
- "emoji": "🦍",
- "name": "gorilla",
- "slug": "gorilla"
- },
- {
- "emoji": "🦧",
- "name": "orangutan",
- "slug": "orangutan"
- },
- {
- "emoji": "🐶",
- "name": "dog face",
- "slug": "dog_face"
- },
- {
- "emoji": "🐕",
- "name": "dog",
- "slug": "dog"
- },
- {
- "emoji": "🦮",
- "name": "guide dog",
- "slug": "guide_dog"
- },
- {
- "emoji": "🐕🦺",
- "name": "service dog",
- "slug": "service_dog"
- },
- {
- "emoji": "🐩",
- "name": "poodle",
- "slug": "poodle"
- },
- {
- "emoji": "🐺",
- "name": "wolf",
- "slug": "wolf"
- },
- {
- "emoji": "🦊",
- "name": "fox",
- "slug": "fox"
- },
- {
- "emoji": "🦝",
- "name": "raccoon",
- "slug": "raccoon"
- },
- {
- "emoji": "🐱",
- "name": "cat face",
- "slug": "cat_face"
- },
- {
- "emoji": "🐈",
- "name": "cat",
- "slug": "cat"
- },
- {
- "emoji": "🐈⬛",
- "name": "black cat",
- "slug": "black_cat"
- },
- {
- "emoji": "🦁",
- "name": "lion",
- "slug": "lion"
- },
- {
- "emoji": "🐯",
- "name": "tiger face",
- "slug": "tiger_face"
- },
- {
- "emoji": "🐅",
- "name": "tiger",
- "slug": "tiger"
- },
- {
- "emoji": "🐆",
- "name": "leopard",
- "slug": "leopard"
- },
- {
- "emoji": "🐴",
- "name": "horse face",
- "slug": "horse_face"
- },
- {
- "emoji": "🐎",
- "name": "horse",
- "slug": "horse"
- },
- {
- "emoji": "🦄",
- "name": "unicorn",
- "slug": "unicorn"
- },
- {
- "emoji": "🦓",
- "name": "zebra",
- "slug": "zebra"
- },
- {
- "emoji": "🦌",
- "name": "deer",
- "slug": "deer"
- },
- {
- "emoji": "🦬",
- "name": "bison",
- "slug": "bison"
- },
- {
- "emoji": "🐮",
- "name": "cow face",
- "slug": "cow_face"
- },
- {
- "emoji": "🐂",
- "name": "ox",
- "slug": "ox"
- },
- {
- "emoji": "🐃",
- "name": "water buffalo",
- "slug": "water_buffalo"
- },
- {
- "emoji": "🐄",
- "name": "cow",
- "slug": "cow"
- },
- {
- "emoji": "🐷",
- "name": "pig face",
- "slug": "pig_face"
- },
- {
- "emoji": "🐖",
- "name": "pig",
- "slug": "pig"
- },
- {
- "emoji": "🐗",
- "name": "boar",
- "slug": "boar"
- },
- {
- "emoji": "🐽",
- "name": "pig nose",
- "slug": "pig_nose"
- },
- {
- "emoji": "🐏",
- "name": "ram",
- "slug": "ram"
- },
- {
- "emoji": "🐑",
- "name": "ewe",
- "slug": "ewe"
- },
- {
- "emoji": "🐐",
- "name": "goat",
- "slug": "goat"
- },
- {
- "emoji": "🐪",
- "name": "camel",
- "slug": "camel"
- },
- {
- "emoji": "🐫",
- "name": "two-hump camel",
- "slug": "two_hump_camel"
- },
- {
- "emoji": "🦙",
- "name": "llama",
- "slug": "llama"
- },
- {
- "emoji": "🦒",
- "name": "giraffe",
- "slug": "giraffe"
- },
- {
- "emoji": "🐘",
- "name": "elephant",
- "slug": "elephant"
- },
- {
- "emoji": "🦣",
- "name": "mammoth",
- "slug": "mammoth"
- },
- {
- "emoji": "🦏",
- "name": "rhinoceros",
- "slug": "rhinoceros"
- },
- {
- "emoji": "🦛",
- "name": "hippopotamus",
- "slug": "hippopotamus"
- },
- {
- "emoji": "🐭",
- "name": "mouse face",
- "slug": "mouse_face"
- },
- {
- "emoji": "🐁",
- "name": "mouse",
- "slug": "mouse"
- },
- {
- "emoji": "🐀",
- "name": "rat",
- "slug": "rat"
- },
- {
- "emoji": "🐹",
- "name": "hamster",
- "slug": "hamster"
- },
- {
- "emoji": "🐰",
- "name": "rabbit face",
- "slug": "rabbit_face"
- },
- {
- "emoji": "🐇",
- "name": "rabbit",
- "slug": "rabbit"
- },
- {
- "emoji": "🐿️",
- "name": "chipmunk",
- "slug": "chipmunk"
- },
- {
- "emoji": "🦫",
- "name": "beaver",
- "slug": "beaver"
- },
- {
- "emoji": "🦔",
- "name": "hedgehog",
- "slug": "hedgehog"
- },
- {
- "emoji": "🦇",
- "name": "bat",
- "slug": "bat"
- },
- {
- "emoji": "🐻",
- "name": "bear",
- "slug": "bear"
- },
- {
- "emoji": "🐻❄️",
- "name": "polar bear",
- "slug": "polar_bear"
- },
- {
- "emoji": "🐨",
- "name": "koala",
- "slug": "koala"
- },
- {
- "emoji": "🐼",
- "name": "panda",
- "slug": "panda"
- },
- {
- "emoji": "🦥",
- "name": "sloth",
- "slug": "sloth"
- },
- {
- "emoji": "🦦",
- "name": "otter",
- "slug": "otter"
- },
- {
- "emoji": "🦨",
- "name": "skunk",
- "slug": "skunk"
- },
- {
- "emoji": "🦘",
- "name": "kangaroo",
- "slug": "kangaroo"
- },
- {
- "emoji": "🦡",
- "name": "badger",
- "slug": "badger"
- },
- {
- "emoji": "🐾",
- "name": "paw prints",
- "slug": "paw_prints"
- },
- {
- "emoji": "🦃",
- "name": "turkey",
- "slug": "turkey"
- },
- {
- "emoji": "🐔",
- "name": "chicken",
- "slug": "chicken"
- },
- {
- "emoji": "🐓",
- "name": "rooster",
- "slug": "rooster"
- },
- {
- "emoji": "🐣",
- "name": "hatching chick",
- "slug": "hatching_chick"
- },
- {
- "emoji": "🐤",
- "name": "baby chick",
- "slug": "baby_chick"
- },
+ { "emoji": "🐵", "name": "monkey face", "slug": "monkey_face" },
+ { "emoji": "🐒", "name": "monkey", "slug": "monkey" },
+ { "emoji": "🦍", "name": "gorilla", "slug": "gorilla" },
+ { "emoji": "🦧", "name": "orangutan", "slug": "orangutan" },
+ { "emoji": "🐶", "name": "dog face", "slug": "dog_face" },
+ { "emoji": "🐕", "name": "dog", "slug": "dog" },
+ { "emoji": "🦮", "name": "guide dog", "slug": "guide_dog" },
+ { "emoji": "🐕🦺", "name": "service dog", "slug": "service_dog" },
+ { "emoji": "🐩", "name": "poodle", "slug": "poodle" },
+ { "emoji": "🐺", "name": "wolf", "slug": "wolf" },
+ { "emoji": "🦊", "name": "fox", "slug": "fox" },
+ { "emoji": "🦝", "name": "raccoon", "slug": "raccoon" },
+ { "emoji": "🐱", "name": "cat face", "slug": "cat_face" },
+ { "emoji": "🐈", "name": "cat", "slug": "cat" },
+ { "emoji": "🐈⬛", "name": "black cat", "slug": "black_cat" },
+ { "emoji": "🦁", "name": "lion", "slug": "lion" },
+ { "emoji": "🐯", "name": "tiger face", "slug": "tiger_face" },
+ { "emoji": "🐅", "name": "tiger", "slug": "tiger" },
+ { "emoji": "🐆", "name": "leopard", "slug": "leopard" },
+ { "emoji": "🐴", "name": "horse face", "slug": "horse_face" },
+ { "emoji": "🐎", "name": "horse", "slug": "horse" },
+ { "emoji": "🦄", "name": "unicorn", "slug": "unicorn" },
+ { "emoji": "🦓", "name": "zebra", "slug": "zebra" },
+ { "emoji": "🦌", "name": "deer", "slug": "deer" },
+ { "emoji": "🦬", "name": "bison", "slug": "bison" },
+ { "emoji": "🐮", "name": "cow face", "slug": "cow_face" },
+ { "emoji": "🐂", "name": "ox", "slug": "ox" },
+ { "emoji": "🐃", "name": "water buffalo", "slug": "water_buffalo" },
+ { "emoji": "🐄", "name": "cow", "slug": "cow" },
+ { "emoji": "🐷", "name": "pig face", "slug": "pig_face" },
+ { "emoji": "🐖", "name": "pig", "slug": "pig" },
+ { "emoji": "🐗", "name": "boar", "slug": "boar" },
+ { "emoji": "🐽", "name": "pig nose", "slug": "pig_nose" },
+ { "emoji": "🐏", "name": "ram", "slug": "ram" },
+ { "emoji": "🐑", "name": "ewe", "slug": "ewe" },
+ { "emoji": "🐐", "name": "goat", "slug": "goat" },
+ { "emoji": "🐪", "name": "camel", "slug": "camel" },
+ { "emoji": "🐫", "name": "two-hump camel", "slug": "two_hump_camel" },
+ { "emoji": "🦙", "name": "llama", "slug": "llama" },
+ { "emoji": "🦒", "name": "giraffe", "slug": "giraffe" },
+ { "emoji": "🐘", "name": "elephant", "slug": "elephant" },
+ { "emoji": "🦣", "name": "mammoth", "slug": "mammoth" },
+ { "emoji": "🦏", "name": "rhinoceros", "slug": "rhinoceros" },
+ { "emoji": "🦛", "name": "hippopotamus", "slug": "hippopotamus" },
+ { "emoji": "🐭", "name": "mouse face", "slug": "mouse_face" },
+ { "emoji": "🐁", "name": "mouse", "slug": "mouse" },
+ { "emoji": "🐀", "name": "rat", "slug": "rat" },
+ { "emoji": "🐹", "name": "hamster", "slug": "hamster" },
+ { "emoji": "🐰", "name": "rabbit face", "slug": "rabbit_face" },
+ { "emoji": "🐇", "name": "rabbit", "slug": "rabbit" },
+ { "emoji": "🐿️", "name": "chipmunk", "slug": "chipmunk" },
+ { "emoji": "🦫", "name": "beaver", "slug": "beaver" },
+ { "emoji": "🦔", "name": "hedgehog", "slug": "hedgehog" },
+ { "emoji": "🦇", "name": "bat", "slug": "bat" },
+ { "emoji": "🐻", "name": "bear", "slug": "bear" },
+ { "emoji": "🐻❄️", "name": "polar bear", "slug": "polar_bear" },
+ { "emoji": "🐨", "name": "koala", "slug": "koala" },
+ { "emoji": "🐼", "name": "panda", "slug": "panda" },
+ { "emoji": "🦥", "name": "sloth", "slug": "sloth" },
+ { "emoji": "🦦", "name": "otter", "slug": "otter" },
+ { "emoji": "🦨", "name": "skunk", "slug": "skunk" },
+ { "emoji": "🦘", "name": "kangaroo", "slug": "kangaroo" },
+ { "emoji": "🦡", "name": "badger", "slug": "badger" },
+ { "emoji": "🐾", "name": "paw prints", "slug": "paw_prints" },
+ { "emoji": "🦃", "name": "turkey", "slug": "turkey" },
+ { "emoji": "🐔", "name": "chicken", "slug": "chicken" },
+ { "emoji": "🐓", "name": "rooster", "slug": "rooster" },
+ { "emoji": "🐣", "name": "hatching chick", "slug": "hatching_chick" },
+ { "emoji": "🐤", "name": "baby chick", "slug": "baby_chick" },
{
"emoji": "🐥",
"name": "front-facing baby chick",
"slug": "front_facing_baby_chick"
},
- {
- "emoji": "🐦",
- "name": "bird",
- "slug": "bird"
- },
- {
- "emoji": "🐧",
- "name": "penguin",
- "slug": "penguin"
- },
- {
- "emoji": "🕊️",
- "name": "dove",
- "slug": "dove"
- },
- {
- "emoji": "🦅",
- "name": "eagle",
- "slug": "eagle"
- },
- {
- "emoji": "🦆",
- "name": "duck",
- "slug": "duck"
- },
- {
- "emoji": "🦢",
- "name": "swan",
- "slug": "swan"
- },
- {
- "emoji": "🦉",
- "name": "owl",
- "slug": "owl"
- },
- {
- "emoji": "🦤",
- "name": "dodo",
- "slug": "dodo"
- },
- {
- "emoji": "🪶",
- "name": "feather",
- "slug": "feather"
- },
- {
- "emoji": "🦩",
- "name": "flamingo",
- "slug": "flamingo"
- },
- {
- "emoji": "🦚",
- "name": "peacock",
- "slug": "peacock"
- },
- {
- "emoji": "🦜",
- "name": "parrot",
- "slug": "parrot"
- },
- {
- "emoji": "🐸",
- "name": "frog",
- "slug": "frog"
- },
- {
- "emoji": "🐊",
- "name": "crocodile",
- "slug": "crocodile"
- },
- {
- "emoji": "🐢",
- "name": "turtle",
- "slug": "turtle"
- },
- {
- "emoji": "🦎",
- "name": "lizard",
- "slug": "lizard"
- },
- {
- "emoji": "🐍",
- "name": "snake",
- "slug": "snake"
- },
- {
- "emoji": "🐲",
- "name": "dragon face",
- "slug": "dragon_face"
- },
- {
- "emoji": "🐉",
- "name": "dragon",
- "slug": "dragon"
- },
- {
- "emoji": "🦕",
- "name": "sauropod",
- "slug": "sauropod"
- },
- {
- "emoji": "🦖",
- "name": "T-Rex",
- "slug": "t_rex"
- },
- {
- "emoji": "🐳",
- "name": "spouting whale",
- "slug": "spouting_whale"
- },
- {
- "emoji": "🐋",
- "name": "whale",
- "slug": "whale"
- },
- {
- "emoji": "🐬",
- "name": "dolphin",
- "slug": "dolphin"
- },
- {
- "emoji": "🦭",
- "name": "seal",
- "slug": "seal"
- },
- {
- "emoji": "🐟",
- "name": "fish",
- "slug": "fish"
- },
- {
- "emoji": "🐠",
- "name": "tropical fish",
- "slug": "tropical_fish"
- },
- {
- "emoji": "🐡",
- "name": "blowfish",
- "slug": "blowfish"
- },
- {
- "emoji": "🦈",
- "name": "shark",
- "slug": "shark"
- },
- {
- "emoji": "🐙",
- "name": "octopus",
- "slug": "octopus"
- },
- {
- "emoji": "🐚",
- "name": "spiral shell",
- "slug": "spiral_shell"
- },
- {
- "emoji": "🪸",
- "name": "coral",
- "slug": "coral"
- },
- {
- "emoji": "🐌",
- "name": "snail",
- "slug": "snail"
- },
- {
- "emoji": "🦋",
- "name": "butterfly",
- "slug": "butterfly"
- },
- {
- "emoji": "🐛",
- "name": "bug",
- "slug": "bug"
- },
- {
- "emoji": "🐜",
- "name": "ant",
- "slug": "ant"
- },
- {
- "emoji": "🐝",
- "name": "honeybee",
- "slug": "honeybee"
- },
- {
- "emoji": "🪲",
- "name": "beetle",
- "slug": "beetle"
- },
- {
- "emoji": "🐞",
- "name": "lady beetle",
- "slug": "lady_beetle"
- },
- {
- "emoji": "🦗",
- "name": "cricket",
- "slug": "cricket"
- },
- {
- "emoji": "🪳",
- "name": "cockroach",
- "slug": "cockroach"
- },
- {
- "emoji": "🕷️",
- "name": "spider",
- "slug": "spider"
- },
- {
- "emoji": "🕸️",
- "name": "spider web",
- "slug": "spider_web"
- },
- {
- "emoji": "🦂",
- "name": "scorpion",
- "slug": "scorpion"
- },
- {
- "emoji": "🦟",
- "name": "mosquito",
- "slug": "mosquito"
- },
- {
- "emoji": "🪰",
- "name": "fly",
- "slug": "fly"
- },
- {
- "emoji": "🪱",
- "name": "worm",
- "slug": "worm"
- },
- {
- "emoji": "🦠",
- "name": "microbe",
- "slug": "microbe"
- },
- {
- "emoji": "💐",
- "name": "bouquet",
- "slug": "bouquet"
- },
- {
- "emoji": "🌸",
- "name": "cherry blossom",
- "slug": "cherry_blossom"
- },
- {
- "emoji": "💮",
- "name": "white flower",
- "slug": "white_flower"
- },
- {
- "emoji": "🪷",
- "name": "lotus",
- "slug": "lotus"
- },
- {
- "emoji": "🏵️",
- "name": "rosette",
- "slug": "rosette"
- },
- {
- "emoji": "🌹",
- "name": "rose",
- "slug": "rose"
- },
- {
- "emoji": "🥀",
- "name": "wilted flower",
- "slug": "wilted_flower"
- },
- {
- "emoji": "🌺",
- "name": "hibiscus",
- "slug": "hibiscus"
- },
- {
- "emoji": "🌻",
- "name": "sunflower",
- "slug": "sunflower"
- },
- {
- "emoji": "🌼",
- "name": "blossom",
- "slug": "blossom"
- },
- {
- "emoji": "🌷",
- "name": "tulip",
- "slug": "tulip"
- },
- {
- "emoji": "🌱",
- "name": "seedling",
- "slug": "seedling"
- },
- {
- "emoji": "🪴",
- "name": "potted plant",
- "slug": "potted_plant"
- },
- {
- "emoji": "🌲",
- "name": "evergreen tree",
- "slug": "evergreen_tree"
- },
- {
- "emoji": "🌳",
- "name": "deciduous tree",
- "slug": "deciduous_tree"
- },
- {
- "emoji": "🌴",
- "name": "palm tree",
- "slug": "palm_tree"
- },
- {
- "emoji": "🌵",
- "name": "cactus",
- "slug": "cactus"
- },
- {
- "emoji": "🌾",
- "name": "sheaf of rice",
- "slug": "sheaf_of_rice"
- },
- {
- "emoji": "🌿",
- "name": "herb",
- "slug": "herb"
- },
- {
- "emoji": "☘️",
- "name": "shamrock",
- "slug": "shamrock"
- },
- {
- "emoji": "🍀",
- "name": "four leaf clover",
- "slug": "four_leaf_clover"
- },
- {
- "emoji": "🍁",
- "name": "maple leaf",
- "slug": "maple_leaf"
- },
- {
- "emoji": "🍂",
- "name": "fallen leaf",
- "slug": "fallen_leaf"
- },
+ { "emoji": "🐦", "name": "bird", "slug": "bird" },
+ { "emoji": "🐧", "name": "penguin", "slug": "penguin" },
+ { "emoji": "🕊️", "name": "dove", "slug": "dove" },
+ { "emoji": "🦅", "name": "eagle", "slug": "eagle" },
+ { "emoji": "🦆", "name": "duck", "slug": "duck" },
+ { "emoji": "🦢", "name": "swan", "slug": "swan" },
+ { "emoji": "🦉", "name": "owl", "slug": "owl" },
+ { "emoji": "🦤", "name": "dodo", "slug": "dodo" },
+ { "emoji": "🪶", "name": "feather", "slug": "feather" },
+ { "emoji": "🦩", "name": "flamingo", "slug": "flamingo" },
+ { "emoji": "🦚", "name": "peacock", "slug": "peacock" },
+ { "emoji": "🦜", "name": "parrot", "slug": "parrot" },
+ { "emoji": "🐸", "name": "frog", "slug": "frog" },
+ { "emoji": "🐊", "name": "crocodile", "slug": "crocodile" },
+ { "emoji": "🐢", "name": "turtle", "slug": "turtle" },
+ { "emoji": "🦎", "name": "lizard", "slug": "lizard" },
+ { "emoji": "🐍", "name": "snake", "slug": "snake" },
+ { "emoji": "🐲", "name": "dragon face", "slug": "dragon_face" },
+ { "emoji": "🐉", "name": "dragon", "slug": "dragon" },
+ { "emoji": "🦕", "name": "sauropod", "slug": "sauropod" },
+ { "emoji": "🦖", "name": "T-Rex", "slug": "t_rex" },
+ { "emoji": "🐳", "name": "spouting whale", "slug": "spouting_whale" },
+ { "emoji": "🐋", "name": "whale", "slug": "whale" },
+ { "emoji": "🐬", "name": "dolphin", "slug": "dolphin" },
+ { "emoji": "🦭", "name": "seal", "slug": "seal" },
+ { "emoji": "🐟", "name": "fish", "slug": "fish" },
+ { "emoji": "🐠", "name": "tropical fish", "slug": "tropical_fish" },
+ { "emoji": "🐡", "name": "blowfish", "slug": "blowfish" },
+ { "emoji": "🦈", "name": "shark", "slug": "shark" },
+ { "emoji": "🐙", "name": "octopus", "slug": "octopus" },
+ { "emoji": "🐚", "name": "spiral shell", "slug": "spiral_shell" },
+ { "emoji": "🪸", "name": "coral", "slug": "coral" },
+ { "emoji": "🐌", "name": "snail", "slug": "snail" },
+ { "emoji": "🦋", "name": "butterfly", "slug": "butterfly" },
+ { "emoji": "🐛", "name": "bug", "slug": "bug" },
+ { "emoji": "🐜", "name": "ant", "slug": "ant" },
+ { "emoji": "🐝", "name": "honeybee", "slug": "honeybee" },
+ { "emoji": "🪲", "name": "beetle", "slug": "beetle" },
+ { "emoji": "🐞", "name": "lady beetle", "slug": "lady_beetle" },
+ { "emoji": "🦗", "name": "cricket", "slug": "cricket" },
+ { "emoji": "🪳", "name": "cockroach", "slug": "cockroach" },
+ { "emoji": "🕷️", "name": "spider", "slug": "spider" },
+ { "emoji": "🕸️", "name": "spider web", "slug": "spider_web" },
+ { "emoji": "🦂", "name": "scorpion", "slug": "scorpion" },
+ { "emoji": "🦟", "name": "mosquito", "slug": "mosquito" },
+ { "emoji": "🪰", "name": "fly", "slug": "fly" },
+ { "emoji": "🪱", "name": "worm", "slug": "worm" },
+ { "emoji": "🦠", "name": "microbe", "slug": "microbe" },
+ { "emoji": "💐", "name": "bouquet", "slug": "bouquet" },
+ { "emoji": "🌸", "name": "cherry blossom", "slug": "cherry_blossom" },
+ { "emoji": "💮", "name": "white flower", "slug": "white_flower" },
+ { "emoji": "🪷", "name": "lotus", "slug": "lotus" },
+ { "emoji": "🏵️", "name": "rosette", "slug": "rosette" },
+ { "emoji": "🌹", "name": "rose", "slug": "rose" },
+ { "emoji": "🥀", "name": "wilted flower", "slug": "wilted_flower" },
+ { "emoji": "🌺", "name": "hibiscus", "slug": "hibiscus" },
+ { "emoji": "🌻", "name": "sunflower", "slug": "sunflower" },
+ { "emoji": "🌼", "name": "blossom", "slug": "blossom" },
+ { "emoji": "🌷", "name": "tulip", "slug": "tulip" },
+ { "emoji": "🌱", "name": "seedling", "slug": "seedling" },
+ { "emoji": "🪴", "name": "potted plant", "slug": "potted_plant" },
+ { "emoji": "🌲", "name": "evergreen tree", "slug": "evergreen_tree" },
+ { "emoji": "🌳", "name": "deciduous tree", "slug": "deciduous_tree" },
+ { "emoji": "🌴", "name": "palm tree", "slug": "palm_tree" },
+ { "emoji": "🌵", "name": "cactus", "slug": "cactus" },
+ { "emoji": "🌾", "name": "sheaf of rice", "slug": "sheaf_of_rice" },
+ { "emoji": "🌿", "name": "herb", "slug": "herb" },
+ { "emoji": "☘️", "name": "shamrock", "slug": "shamrock" },
+ { "emoji": "🍀", "name": "four leaf clover", "slug": "four_leaf_clover" },
+ { "emoji": "🍁", "name": "maple leaf", "slug": "maple_leaf" },
+ { "emoji": "🍂", "name": "fallen leaf", "slug": "fallen_leaf" },
{
"emoji": "🍃",
"name": "leaf fluttering in wind",
"slug": "leaf_fluttering_in_wind"
},
- {
- "emoji": "🪹",
- "name": "empty nest",
- "slug": "empty_nest"
- },
- {
- "emoji": "🪺",
- "name": "nest with eggs",
- "slug": "nest_with_eggs"
- },
- {
- "emoji": "🍄",
- "name": "mushroom",
- "slug": "mushroom"
- }
+ { "emoji": "🪹", "name": "empty nest", "slug": "empty_nest" },
+ { "emoji": "🪺", "name": "nest with eggs", "slug": "nest_with_eggs" },
+ { "emoji": "🍄", "name": "mushroom", "slug": "mushroom" }
]
},
{
"name": "Food & Drink",
"slug": "food_drink",
"emojis": [
- {
- "emoji": "🍇",
- "name": "grapes",
- "slug": "grapes_fruit"
- },
- {
- "emoji": "🍈",
- "name": "melon",
- "slug": "melon_fruit"
- },
- {
- "emoji": "🍉",
- "name": "watermelon",
- "slug": "watermelon_fruit"
- },
- {
- "emoji": "🍊",
- "name": "tangerine",
- "slug": "tangerine_fruit"
- },
- {
- "emoji": "🍋",
- "name": "lemon",
- "slug": "lemon_fruit"
- },
- {
- "emoji": "🍌",
- "name": "banana",
- "slug": "banana_fruit"
- },
- {
- "emoji": "🍍",
- "name": "pineapple",
- "slug": "pineapple_fruit"
- },
- {
- "emoji": "🥭",
- "name": "mango",
- "slug": "mango_fruit"
- },
- {
- "emoji": "🍎",
- "name": "red apple",
- "slug": "red_apple"
- },
- {
- "emoji": "🍏",
- "name": "green apple",
- "slug": "green_apple"
- },
- {
- "emoji": "🍐",
- "name": "pear",
- "slug": "pear_fruit"
- },
- {
- "emoji": "🍑",
- "name": "peach",
- "slug": "peach_fruit"
- },
- {
- "emoji": "🍒",
- "name": "cherries",
- "slug": "cherries_fruit"
- },
- {
- "emoji": "🍓",
- "name": "strawberry",
- "slug": "strawberry_fruit"
- },
- {
- "emoji": "🫐",
- "name": "blueberries",
- "slug": "blueberries_blue"
- },
- {
- "emoji": "🥝",
- "name": "kiwi fruit",
- "slug": "kiwi_fruit_fruit"
- },
- {
- "emoji": "🍅",
- "name": "tomato",
- "slug": "tomato_fruit"
- },
- {
- "emoji": "🫒",
- "name": "olive",
- "slug": "olive"
- },
- {
- "emoji": "🥥",
- "name": "coconut",
- "slug": "coconut_palm"
- },
- {
- "emoji": "🥑",
- "name": "avocado",
- "slug": "avocado_fruit"
- },
- {
- "emoji": "🍆",
- "name": "eggplant",
- "slug": "eggplant"
- },
- {
- "emoji": "🥔",
- "name": "potato",
- "slug": "potato"
- },
- {
- "emoji": "🥕",
- "name": "carrot",
- "slug": "carrot"
- },
- {
- "emoji": "🌽",
- "name": "ear of corn",
- "slug": "ear_of_corn"
- },
- {
- "emoji": "🌶️",
- "name": "hot pepper",
- "slug": "hot_pepper"
- },
- {
- "emoji": "🫑",
- "name": "bell pepper",
- "slug": "bell_pepper"
- },
- {
- "emoji": "🥒",
- "name": "cucumber",
- "slug": "cucumber"
- },
- {
- "emoji": "🥬",
- "name": "leafy green",
- "slug": "leafy_green"
- },
- {
- "emoji": "🥦",
- "name": "broccoli",
- "slug": "broccoli"
- },
- {
- "emoji": "🧄",
- "name": "garlic",
- "slug": "garlic"
- },
- {
- "emoji": "🧅",
- "name": "onion",
- "slug": "onion"
- },
- {
- "emoji": "🥜",
- "name": "peanuts",
- "slug": "peanuts"
- },
- {
- "emoji": "🫘",
- "name": "beans",
- "slug": "beans"
- },
- {
- "emoji": "🌰",
- "name": "chestnut",
- "slug": "chestnut"
- },
- {
- "emoji": "🍞",
- "name": "bread",
- "slug": "bread_loaf"
- },
- {
- "emoji": "🥐",
- "name": "croissant",
- "slug": "croissant_breakfast"
- },
- {
- "emoji": "🥖",
- "name": "baguette bread",
- "slug": "baguette_bread"
- },
- {
- "emoji": "🫓",
- "name": "flatbread",
- "slug": "flatbread"
- },
- {
- "emoji": "🥨",
- "name": "pretzel",
- "slug": "pretzel"
- },
- {
- "emoji": "🥯",
- "name": "bagel",
- "slug": "bagel"
- },
- {
- "emoji": "🥞",
- "name": "pancakes",
- "slug": "pancakes"
- },
- {
- "emoji": "🧇",
- "name": "waffle",
- "slug": "waffle"
- },
- {
- "emoji": "🧀",
- "name": "cheese wedge",
- "slug": "cheese_wedge"
- },
- {
- "emoji": "🍖",
- "name": "meat on bone",
- "slug": "meat_on_bone"
- },
- {
- "emoji": "🍗",
- "name": "poultry leg",
- "slug": "poultry_leg_chicken"
- },
- {
- "emoji": "🥩",
- "name": "cut of meat",
- "slug": "cut_of_meat"
- },
- {
- "emoji": "🥓",
- "name": "bacon",
- "slug": "bacon"
- },
- {
- "emoji": "🍔",
- "name": "hamburger",
- "slug": "hamburger"
- },
- {
- "emoji": "🍟",
- "name": "french fries",
- "slug": "french_fries"
- },
- {
- "emoji": "🍕",
- "name": "pizza",
- "slug": "pizza"
- },
- {
- "emoji": "🌭",
- "name": "hot dog",
- "slug": "hot_dog"
- },
- {
- "emoji": "🥪",
- "name": "sandwich",
- "slug": "sandwich"
- },
- {
- "emoji": "🌮",
- "name": "taco",
- "slug": "taco"
- },
- {
- "emoji": "🌯",
- "name": "burrito",
- "slug": "burrito"
- },
- {
- "emoji": "🫔",
- "name": "tamale",
- "slug": "tamale"
- },
+ { "emoji": "🍇", "name": "grapes", "slug": "grapes_fruit" },
+ { "emoji": "🍈", "name": "melon", "slug": "melon_fruit" },
+ { "emoji": "🍉", "name": "watermelon", "slug": "watermelon_fruit" },
+ { "emoji": "🍊", "name": "tangerine", "slug": "tangerine_fruit" },
+ { "emoji": "🍋", "name": "lemon", "slug": "lemon_fruit" },
+ { "emoji": "🍌", "name": "banana", "slug": "banana_fruit" },
+ { "emoji": "🍍", "name": "pineapple", "slug": "pineapple_fruit" },
+ { "emoji": "🥭", "name": "mango", "slug": "mango_fruit" },
+ { "emoji": "🍎", "name": "red apple", "slug": "red_apple" },
+ { "emoji": "🍏", "name": "green apple", "slug": "green_apple" },
+ { "emoji": "🍐", "name": "pear", "slug": "pear_fruit" },
+ { "emoji": "🍑", "name": "peach", "slug": "peach_fruit" },
+ { "emoji": "🍒", "name": "cherries", "slug": "cherries_fruit" },
+ { "emoji": "🍓", "name": "strawberry", "slug": "strawberry_fruit" },
+ { "emoji": "🫐", "name": "blueberries", "slug": "blueberries_blue" },
+ { "emoji": "🥝", "name": "kiwi fruit", "slug": "kiwi_fruit_fruit" },
+ { "emoji": "🍅", "name": "tomato", "slug": "tomato_fruit" },
+ { "emoji": "🫒", "name": "olive", "slug": "olive" },
+ { "emoji": "🥥", "name": "coconut", "slug": "coconut_palm" },
+ { "emoji": "🥑", "name": "avocado", "slug": "avocado_fruit" },
+ { "emoji": "🍆", "name": "eggplant", "slug": "eggplant" },
+ { "emoji": "🥔", "name": "potato", "slug": "potato" },
+ { "emoji": "🥕", "name": "carrot", "slug": "carrot" },
+ { "emoji": "🌽", "name": "ear of corn", "slug": "ear_of_corn" },
+ { "emoji": "🌶️", "name": "hot pepper", "slug": "hot_pepper" },
+ { "emoji": "🫑", "name": "bell pepper", "slug": "bell_pepper" },
+ { "emoji": "🥒", "name": "cucumber", "slug": "cucumber" },
+ { "emoji": "🥬", "name": "leafy green", "slug": "leafy_green" },
+ { "emoji": "🥦", "name": "broccoli", "slug": "broccoli" },
+ { "emoji": "🧄", "name": "garlic", "slug": "garlic" },
+ { "emoji": "🧅", "name": "onion", "slug": "onion" },
+ { "emoji": "🥜", "name": "peanuts", "slug": "peanuts" },
+ { "emoji": "🫘", "name": "beans", "slug": "beans" },
+ { "emoji": "🌰", "name": "chestnut", "slug": "chestnut" },
+ { "emoji": "🍞", "name": "bread", "slug": "bread_loaf" },
+ { "emoji": "🥐", "name": "croissant", "slug": "croissant_breakfast" },
+ { "emoji": "🥖", "name": "baguette bread", "slug": "baguette_bread" },
+ { "emoji": "🫓", "name": "flatbread", "slug": "flatbread" },
+ { "emoji": "🥨", "name": "pretzel", "slug": "pretzel" },
+ { "emoji": "🥯", "name": "bagel", "slug": "bagel" },
+ { "emoji": "🥞", "name": "pancakes", "slug": "pancakes" },
+ { "emoji": "🧇", "name": "waffle", "slug": "waffle" },
+ { "emoji": "🧀", "name": "cheese wedge", "slug": "cheese_wedge" },
+ { "emoji": "🍖", "name": "meat on bone", "slug": "meat_on_bone" },
+ { "emoji": "🍗", "name": "poultry leg", "slug": "poultry_leg_chicken" },
+ { "emoji": "🥩", "name": "cut of meat", "slug": "cut_of_meat" },
+ { "emoji": "🥓", "name": "bacon", "slug": "bacon" },
+ { "emoji": "🍔", "name": "hamburger", "slug": "hamburger" },
+ { "emoji": "🍟", "name": "french fries", "slug": "french_fries" },
+ { "emoji": "🍕", "name": "pizza", "slug": "pizza" },
+ { "emoji": "🌭", "name": "hot dog", "slug": "hot_dog" },
+ { "emoji": "🥪", "name": "sandwich", "slug": "sandwich" },
+ { "emoji": "🌮", "name": "taco", "slug": "taco" },
+ { "emoji": "🌯", "name": "burrito", "slug": "burrito" },
+ { "emoji": "🫔", "name": "tamale", "slug": "tamale" },
{
"emoji": "🥙",
"name": "stuffed flatbread",
"slug": "stuffed_flatbread"
},
- {
- "emoji": "🧆",
- "name": "falafel",
- "slug": "falafel"
- },
- {
- "emoji": "🥚",
- "name": "egg",
- "slug": "egg"
- },
- {
- "emoji": "🍳",
- "name": "cooking",
- "slug": "cooking"
- },
+ { "emoji": "🧆", "name": "falafel", "slug": "falafel" },
+ { "emoji": "🥚", "name": "egg", "slug": "egg" },
+ { "emoji": "🍳", "name": "cooking", "slug": "cooking" },
{
"emoji": "🥘",
"name": "shallow pan of food",
"slug": "shallow_pan_of_food"
},
- {
- "emoji": "🍲",
- "name": "pot of food",
- "slug": "pot_of_food"
- },
- {
- "emoji": "🫕",
- "name": "fondue",
- "slug": "fondue"
- },
- {
- "emoji": "🥣",
- "name": "bowl with spoon",
- "slug": "bowl_with_spoon"
- },
- {
- "emoji": "🥗",
- "name": "green salad",
- "slug": "green_salad"
- },
- {
- "emoji": "🍿",
- "name": "popcorn",
- "slug": "popcorn"
- },
- {
- "emoji": "🧈",
- "name": "butter",
- "slug": "butter"
- },
- {
- "emoji": "🧂",
- "name": "salt",
- "slug": "salt"
- },
- {
- "emoji": "🥫",
- "name": "canned food",
- "slug": "canned_food"
- },
- {
- "emoji": "🍱",
- "name": "bento box",
- "slug": "bento_box"
- },
- {
- "emoji": "🍘",
- "name": "rice cracker",
- "slug": "rice_cracker"
- },
- {
- "emoji": "🍙",
- "name": "rice ball",
- "slug": "rice_ball"
- },
- {
- "emoji": "🍚",
- "name": "cooked rice",
- "slug": "cooked_rice"
- },
- {
- "emoji": "🍛",
- "name": "curry rice",
- "slug": "curry_rice"
- },
- {
- "emoji": "🍜",
- "name": "steaming bowl",
- "slug": "steaming_bowl"
- },
- {
- "emoji": "🍝",
- "name": "spaghetti",
- "slug": "spaghetti"
- },
+ { "emoji": "🍲", "name": "pot of food", "slug": "pot_of_food" },
+ { "emoji": "🫕", "name": "fondue", "slug": "fondue" },
+ { "emoji": "🥣", "name": "bowl with spoon", "slug": "bowl_with_spoon" },
+ { "emoji": "🥗", "name": "green salad", "slug": "green_salad" },
+ { "emoji": "🍿", "name": "popcorn", "slug": "popcorn" },
+ { "emoji": "🧈", "name": "butter", "slug": "butter" },
+ { "emoji": "🧂", "name": "salt", "slug": "salt" },
+ { "emoji": "🥫", "name": "canned food", "slug": "canned_food" },
+ { "emoji": "🍱", "name": "bento box", "slug": "bento_box" },
+ { "emoji": "🍘", "name": "rice cracker", "slug": "rice_cracker" },
+ { "emoji": "🍙", "name": "rice ball", "slug": "rice_ball" },
+ { "emoji": "🍚", "name": "cooked rice", "slug": "cooked_rice" },
+ { "emoji": "🍛", "name": "curry rice", "slug": "curry_rice" },
+ { "emoji": "🍜", "name": "steaming bowl", "slug": "steaming_bowl" },
+ { "emoji": "🍝", "name": "spaghetti", "slug": "spaghetti" },
{
"emoji": "🍠",
"name": "roasted sweet potato",
"slug": "roasted_sweet_potato"
},
- {
- "emoji": "🍢",
- "name": "oden",
- "slug": "oden"
- },
- {
- "emoji": "🍣",
- "name": "sushi",
- "slug": "sushi"
- },
- {
- "emoji": "🍤",
- "name": "fried shrimp",
- "slug": "fried_shrimp"
- },
+ { "emoji": "🍢", "name": "oden", "slug": "oden" },
+ { "emoji": "🍣", "name": "sushi", "slug": "sushi" },
+ { "emoji": "🍤", "name": "fried shrimp", "slug": "fried_shrimp" },
{
"emoji": "🍥",
"name": "fish cake with swirl",
"slug": "fish_cake_with_swirl"
},
- {
- "emoji": "🥮",
- "name": "moon cake",
- "slug": "moon_cake"
- },
- {
- "emoji": "🍡",
- "name": "dango",
- "slug": "dango"
- },
- {
- "emoji": "🥟",
- "name": "dumpling",
- "slug": "dumpling"
- },
- {
- "emoji": "🥠",
- "name": "fortune cookie",
- "slug": "fortune_cookie"
- },
- {
- "emoji": "🥡",
- "name": "takeout box",
- "slug": "takeout_box"
- },
- {
- "emoji": "🦀",
- "name": "crab",
- "slug": "crab"
- },
- {
- "emoji": "🦞",
- "name": "lobster",
- "slug": "lobster"
- },
- {
- "emoji": "🦐",
- "name": "shrimp",
- "slug": "shrimp"
- },
- {
- "emoji": "🦑",
- "name": "squid",
- "slug": "squid"
- },
- {
- "emoji": "🦪",
- "name": "oyster",
- "slug": "oyster"
- },
- {
- "emoji": "🍦",
- "name": "soft ice cream",
- "slug": "soft_ice_cream"
- },
- {
- "emoji": "🍧",
- "name": "shaved ice",
- "slug": "shaved_ice"
- },
- {
- "emoji": "🍨",
- "name": "ice cream",
- "slug": "ice_cream"
- },
- {
- "emoji": "🍩",
- "name": "doughnut",
- "slug": "doughnut"
- },
- {
- "emoji": "🍪",
- "name": "cookie",
- "slug": "cookie"
- },
- {
- "emoji": "🎂",
- "name": "birthday cake",
- "slug": "birthday_cake"
- },
- {
- "emoji": "🍰",
- "name": "shortcake",
- "slug": "shortcake"
- },
- {
- "emoji": "🧁",
- "name": "cupcake",
- "slug": "cupcake"
- },
- {
- "emoji": "🥧",
- "name": "pie",
- "slug": "pie"
- },
- {
- "emoji": "🍫",
- "name": "chocolate bar",
- "slug": "chocolate_bar"
- },
- {
- "emoji": "🍬",
- "name": "candy",
- "slug": "candy"
- },
- {
- "emoji": "🍭",
- "name": "lollipop",
- "slug": "lollipop"
- },
- {
- "emoji": "🍮",
- "name": "custard",
- "slug": "custard"
- },
- {
- "emoji": "🍯",
- "name": "honey pot",
- "slug": "honey_pot"
- },
- {
- "emoji": "🍼",
- "name": "baby bottle",
- "slug": "baby_bottle"
- },
- {
- "emoji": "🥛",
- "name": "glass of milk",
- "slug": "glass_of_milk"
- },
- {
- "emoji": "☕",
- "name": "hot beverage",
- "slug": "hot_beverage"
- },
- {
- "emoji": "🫖",
- "name": "teapot",
- "slug": "teapot"
- },
+ { "emoji": "🥮", "name": "moon cake", "slug": "moon_cake" },
+ { "emoji": "🍡", "name": "dango", "slug": "dango" },
+ { "emoji": "🥟", "name": "dumpling", "slug": "dumpling" },
+ { "emoji": "🥠", "name": "fortune cookie", "slug": "fortune_cookie" },
+ { "emoji": "🥡", "name": "takeout box", "slug": "takeout_box" },
+ { "emoji": "🦀", "name": "crab", "slug": "crab" },
+ { "emoji": "🦞", "name": "lobster", "slug": "lobster" },
+ { "emoji": "🦐", "name": "shrimp", "slug": "shrimp" },
+ { "emoji": "🦑", "name": "squid", "slug": "squid" },
+ { "emoji": "🦪", "name": "oyster", "slug": "oyster" },
+ { "emoji": "🍦", "name": "soft ice cream", "slug": "soft_ice_cream" },
+ { "emoji": "🍧", "name": "shaved ice", "slug": "shaved_ice" },
+ { "emoji": "🍨", "name": "ice cream", "slug": "ice_cream" },
+ { "emoji": "🍩", "name": "doughnut", "slug": "doughnut" },
+ { "emoji": "🍪", "name": "cookie", "slug": "cookie" },
+ { "emoji": "🎂", "name": "birthday cake", "slug": "birthday_cake" },
+ { "emoji": "🍰", "name": "shortcake", "slug": "shortcake" },
+ { "emoji": "🧁", "name": "cupcake", "slug": "cupcake" },
+ { "emoji": "🥧", "name": "pie", "slug": "pie" },
+ { "emoji": "🍫", "name": "chocolate bar", "slug": "chocolate_bar" },
+ { "emoji": "🍬", "name": "candy", "slug": "candy" },
+ { "emoji": "🍭", "name": "lollipop", "slug": "lollipop" },
+ { "emoji": "🍮", "name": "custard", "slug": "custard" },
+ { "emoji": "🍯", "name": "honey pot", "slug": "honey_pot" },
+ { "emoji": "🍼", "name": "baby bottle", "slug": "baby_bottle" },
+ { "emoji": "🥛", "name": "glass of milk", "slug": "glass_of_milk" },
+ { "emoji": "☕️", "name": "hot beverage", "slug": "hot_beverage" },
+ { "emoji": "🫖", "name": "teapot", "slug": "teapot" },
{
"emoji": "🍵",
"name": "teacup without handle",
"slug": "teacup_without_handle"
},
- {
- "emoji": "🍶",
- "name": "sake",
- "slug": "sake"
- },
+ { "emoji": "🍶", "name": "sake", "slug": "sake" },
{
"emoji": "🍾",
"name": "bottle with popping cork",
"slug": "bottle_with_popping_cork"
},
- {
- "emoji": "🍷",
- "name": "wine glass",
- "slug": "wine_glass"
- },
- {
- "emoji": "🍸",
- "name": "cocktail glass",
- "slug": "cocktail_glass"
- },
- {
- "emoji": "🍹",
- "name": "tropical drink",
- "slug": "tropical_drink"
- },
- {
- "emoji": "🍺",
- "name": "beer mug",
- "slug": "beer_mug"
- },
+ { "emoji": "🍷", "name": "wine glass", "slug": "wine_glass" },
+ { "emoji": "🍸", "name": "cocktail glass", "slug": "cocktail_glass" },
+ { "emoji": "🍹", "name": "tropical drink", "slug": "tropical_drink" },
+ { "emoji": "🍺", "name": "beer mug", "slug": "beer_mug" },
{
"emoji": "🍻",
"name": "clinking beer mugs",
"slug": "clinking_beer_mugs"
},
- {
- "emoji": "🥂",
- "name": "clinking glasses",
- "slug": "clinking_glasses"
- },
- {
- "emoji": "🥃",
- "name": "tumbler glass",
- "slug": "tumbler_glass"
- },
- {
- "emoji": "🫗",
- "name": "pouring liquid",
- "slug": "pouring_liquid"
- },
- {
- "emoji": "🥤",
- "name": "cup with straw",
- "slug": "cup_with_straw"
- },
- {
- "emoji": "🧋",
- "name": "bubble tea",
- "slug": "bubble_tea"
- },
- {
- "emoji": "🧃",
- "name": "beverage box",
- "slug": "beverage_box"
- },
- {
- "emoji": "🧉",
- "name": "mate",
- "slug": "mate"
- },
- {
- "emoji": "🧊",
- "name": "ice",
- "slug": "ice"
- },
- {
- "emoji": "🥢",
- "name": "chopsticks",
- "slug": "chopsticks"
- },
+ { "emoji": "🥂", "name": "clinking glasses", "slug": "clinking_glasses" },
+ { "emoji": "🥃", "name": "tumbler glass", "slug": "tumbler_glass" },
+ { "emoji": "🫗", "name": "pouring liquid", "slug": "pouring_liquid" },
+ { "emoji": "🥤", "name": "cup with straw", "slug": "cup_with_straw" },
+ { "emoji": "🧋", "name": "bubble tea", "slug": "bubble_tea" },
+ { "emoji": "🧃", "name": "beverage box", "slug": "beverage_box" },
+ { "emoji": "🧉", "name": "mate", "slug": "mate" },
+ { "emoji": "🧊", "name": "ice", "slug": "ice" },
+ { "emoji": "🥢", "name": "chopsticks", "slug": "chopsticks" },
{
"emoji": "🍽️",
"name": "fork and knife with plate",
"slug": "fork_and_knife_with_plate"
},
- {
- "emoji": "🍴",
- "name": "fork and knife",
- "slug": "fork_and_knife"
- },
- {
- "emoji": "🥄",
- "name": "spoon",
- "slug": "spoon"
- },
- {
- "emoji": "🔪",
- "name": "kitchen knife",
- "slug": "kitchen_knife"
- },
- {
- "emoji": "🫙",
- "name": "jar",
- "slug": "jar"
- },
- {
- "emoji": "🏺",
- "name": "amphora",
- "slug": "amphora"
- }
+ { "emoji": "🍴", "name": "fork and knife", "slug": "fork_and_knife" },
+ { "emoji": "🥄", "name": "spoon", "slug": "spoon" },
+ { "emoji": "🔪", "name": "kitchen knife", "slug": "kitchen_knife" },
+ { "emoji": "🫙", "name": "jar", "slug": "jar" },
+ { "emoji": "🏺", "name": "amphora", "slug": "amphora" }
]
},
{
@@ -4032,16 +2168,8 @@
"name": "globe with meridians",
"slug": "globe_with_meridians_world_earth"
},
- {
- "emoji": "🗺️",
- "name": "world map",
- "slug": "world_map"
- },
- {
- "emoji": "🗾",
- "name": "map of Japan",
- "slug": "map_of_japan"
- },
+ { "emoji": "🗺️", "name": "world map", "slug": "world_map" },
+ { "emoji": "🗾", "name": "map of Japan", "slug": "map_of_japan" },
{
"emoji": "🧭",
"name": "compass",
@@ -4052,51 +2180,19 @@
"name": "snow-capped mountain",
"slug": "snow_capped_mountain"
},
- {
- "emoji": "⛰️",
- "name": "mountain",
- "slug": "mountain"
- },
- {
- "emoji": "🌋",
- "name": "volcano",
- "slug": "volcano"
- },
- {
- "emoji": "🗻",
- "name": "mount fuji",
- "slug": "mount_fuji"
- },
- {
- "emoji": "🏕️",
- "name": "camping",
- "slug": "camping"
- },
+ { "emoji": "⛰️", "name": "mountain", "slug": "mountain" },
+ { "emoji": "🌋", "name": "volcano", "slug": "volcano" },
+ { "emoji": "🗻", "name": "mount fuji", "slug": "mount_fuji" },
+ { "emoji": "🏕️", "name": "camping", "slug": "camping" },
{
"emoji": "🏖️",
"name": "beach with umbrella",
"slug": "beach_with_umbrella"
},
- {
- "emoji": "🏜️",
- "name": "desert",
- "slug": "desert"
- },
- {
- "emoji": "🏝️",
- "name": "desert island",
- "slug": "desert_island"
- },
- {
- "emoji": "🏞️",
- "name": "national park",
- "slug": "national_park"
- },
- {
- "emoji": "🏟️",
- "name": "stadium",
- "slug": "stadium"
- },
+ { "emoji": "🏜️", "name": "desert", "slug": "desert" },
+ { "emoji": "🏝️", "name": "desert island", "slug": "desert_island" },
+ { "emoji": "🏞️", "name": "national park", "slug": "national_park" },
+ { "emoji": "🏟️", "name": "stadium", "slug": "stadium" },
{
"emoji": "🏛️",
"name": "classical building",
@@ -4107,356 +2203,104 @@
"name": "building construction",
"slug": "building_construction"
},
- {
- "emoji": "🧱",
- "name": "brick",
- "slug": "brick"
- },
- {
- "emoji": "🪨",
- "name": "rock",
- "slug": "rock"
- },
- {
- "emoji": "🪵",
- "name": "wood",
- "slug": "wood"
- },
- {
- "emoji": "🛖",
- "name": "hut",
- "slug": "hut"
- },
- {
- "emoji": "🏘️",
- "name": "houses",
- "slug": "houses"
- },
- {
- "emoji": "🏚️",
- "name": "derelict house",
- "slug": "derelict_house"
- },
- {
- "emoji": "🏠",
- "name": "house",
- "slug": "house"
- },
+ { "emoji": "🧱", "name": "brick", "slug": "brick" },
+ { "emoji": "🪨", "name": "rock", "slug": "rock" },
+ { "emoji": "🪵", "name": "wood", "slug": "wood" },
+ { "emoji": "🛖", "name": "hut", "slug": "hut" },
+ { "emoji": "🏘️", "name": "houses", "slug": "houses" },
+ { "emoji": "🏚️", "name": "derelict house", "slug": "derelict_house" },
+ { "emoji": "🏠", "name": "house", "slug": "house" },
{
"emoji": "🏡",
"name": "house with garden",
"slug": "house_with_garden"
},
- {
- "emoji": "🏢",
- "name": "office building",
- "slug": "office_building"
- },
+ { "emoji": "🏢", "name": "office building", "slug": "office_building" },
{
"emoji": "🏣",
"name": "Japanese post office",
"slug": "japanese_post_office"
},
- {
- "emoji": "🏤",
- "name": "post office",
- "slug": "post_office"
- },
- {
- "emoji": "🏥",
- "name": "hospital",
- "slug": "hospital"
- },
- {
- "emoji": "🏦",
- "name": "bank",
- "slug": "bank"
- },
- {
- "emoji": "🏨",
- "name": "hotel",
- "slug": "hotel"
- },
- {
- "emoji": "🏩",
- "name": "love hotel",
- "slug": "love_hotel"
- },
+ { "emoji": "🏤", "name": "post office", "slug": "post_office" },
+ { "emoji": "🏥", "name": "hospital", "slug": "hospital" },
+ { "emoji": "🏦", "name": "bank", "slug": "bank" },
+ { "emoji": "🏨", "name": "hotel", "slug": "hotel" },
+ { "emoji": "🏩", "name": "love hotel", "slug": "love_hotel" },
{
"emoji": "🏪",
"name": "convenience store",
"slug": "convenience_store"
},
- {
- "emoji": "🏫",
- "name": "school",
- "slug": "school"
- },
- {
- "emoji": "🏬",
- "name": "department store",
- "slug": "department_store"
- },
- {
- "emoji": "🏭",
- "name": "factory",
- "slug": "factory"
- },
- {
- "emoji": "🏯",
- "name": "Japanese castle",
- "slug": "japanese_castle"
- },
- {
- "emoji": "🏰",
- "name": "castle",
- "slug": "castle"
- },
- {
- "emoji": "💒",
- "name": "wedding",
- "slug": "wedding"
- },
- {
- "emoji": "🗼",
- "name": "Tokyo tower",
- "slug": "tokyo_tower"
- },
+ { "emoji": "🏫", "name": "school", "slug": "school" },
+ { "emoji": "🏬", "name": "department store", "slug": "department_store" },
+ { "emoji": "🏭", "name": "factory", "slug": "factory" },
+ { "emoji": "🏯", "name": "Japanese castle", "slug": "japanese_castle" },
+ { "emoji": "🏰", "name": "castle", "slug": "castle" },
+ { "emoji": "💒", "name": "wedding", "slug": "wedding" },
+ { "emoji": "🗼", "name": "Tokyo tower", "slug": "tokyo_tower" },
{
"emoji": "🗽",
"name": "Statue of Liberty",
"slug": "statue_of_liberty"
},
- {
- "emoji": "⛪",
- "name": "church",
- "slug": "church"
- },
- {
- "emoji": "🕌",
- "name": "mosque",
- "slug": "mosque"
- },
- {
- "emoji": "🛕",
- "name": "hindu temple",
- "slug": "hindu_temple"
- },
- {
- "emoji": "🕍",
- "name": "synagogue",
- "slug": "synagogue"
- },
- {
- "emoji": "⛩️",
- "name": "shinto shrine",
- "slug": "shinto_shrine"
- },
- {
- "emoji": "🕋",
- "name": "kaaba",
- "slug": "kaaba"
- },
- {
- "emoji": "⛲",
- "name": "fountain",
- "slug": "fountain"
- },
- {
- "emoji": "⛺",
- "name": "tent",
- "slug": "tent"
- },
- {
- "emoji": "🌁",
- "name": "foggy",
- "slug": "foggy"
- },
- {
- "emoji": "🌃",
- "name": "night with stars",
- "slug": "night_with_stars"
- },
- {
- "emoji": "🏙️",
- "name": "cityscape",
- "slug": "cityscape"
- },
+ { "emoji": "⛪️", "name": "church", "slug": "church" },
+ { "emoji": "🕌", "name": "mosque", "slug": "mosque" },
+ { "emoji": "🛕", "name": "hindu temple", "slug": "hindu_temple" },
+ { "emoji": "🕍", "name": "synagogue", "slug": "synagogue" },
+ { "emoji": "⛩️", "name": "shinto shrine", "slug": "shinto_shrine" },
+ { "emoji": "🕋", "name": "kaaba", "slug": "kaaba" },
+ { "emoji": "⛲️", "name": "fountain", "slug": "fountain" },
+ { "emoji": "⛺️", "name": "tent", "slug": "tent" },
+ { "emoji": "🌁", "name": "foggy", "slug": "foggy" },
+ { "emoji": "🌃", "name": "night with stars", "slug": "night_with_stars" },
+ { "emoji": "🏙️", "name": "cityscape", "slug": "cityscape" },
{
"emoji": "🌄",
"name": "sunrise over mountains",
"slug": "sunrise_over_mountains"
},
- {
- "emoji": "🌅",
- "name": "sunrise",
- "slug": "sunrise"
- },
+ { "emoji": "🌅", "name": "sunrise", "slug": "sunrise" },
{
"emoji": "🌆",
"name": "cityscape at dusk",
"slug": "cityscape_at_dusk"
},
- {
- "emoji": "🌇",
- "name": "sunset",
- "slug": "sunset"
- },
- {
- "emoji": "🌉",
- "name": "bridge at night",
- "slug": "bridge_at_night"
- },
- {
- "emoji": "♨️",
- "name": "hot springs",
- "slug": "hot_springs"
- },
- {
- "emoji": "🎠",
- "name": "carousel horse",
- "slug": "carousel_horse"
- },
- {
- "emoji": "🛝",
- "name": "playground slide",
- "slug": "playground_slide"
- },
- {
- "emoji": "🎡",
- "name": "ferris wheel",
- "slug": "ferris_wheel"
- },
- {
- "emoji": "🎢",
- "name": "roller coaster",
- "slug": "roller_coaster"
- },
- {
- "emoji": "💈",
- "name": "barber pole",
- "slug": "barber_pole"
- },
- {
- "emoji": "🎪",
- "name": "circus tent",
- "slug": "circus_tent"
- },
- {
- "emoji": "🚂",
- "name": "locomotive",
- "slug": "locomotive"
- },
- {
- "emoji": "🚃",
- "name": "railway car",
- "slug": "railway_car"
- },
- {
- "emoji": "🚄",
- "name": "high-speed train",
- "slug": "high_speed_train"
- },
- {
- "emoji": "🚅",
- "name": "bullet train",
- "slug": "bullet_train"
- },
- {
- "emoji": "🚆",
- "name": "train",
- "slug": "train"
- },
- {
- "emoji": "🚇",
- "name": "metro",
- "slug": "metro"
- },
- {
- "emoji": "🚈",
- "name": "light rail",
- "slug": "light_rail"
- },
- {
- "emoji": "🚉",
- "name": "station",
- "slug": "station"
- },
- {
- "emoji": "🚊",
- "name": "tram",
- "slug": "tram"
- },
- {
- "emoji": "🚝",
- "name": "monorail",
- "slug": "monorail"
- },
- {
- "emoji": "🚞",
- "name": "mountain railway",
- "slug": "mountain_railway"
- },
- {
- "emoji": "🚋",
- "name": "tram car",
- "slug": "tram_car"
- },
- {
- "emoji": "🚌",
- "name": "bus",
- "slug": "bus"
- },
- {
- "emoji": "🚍",
- "name": "oncoming bus",
- "slug": "oncoming_bus"
- },
- {
- "emoji": "🚎",
- "name": "trolleybus",
- "slug": "trolleybus"
- },
- {
- "emoji": "🚐",
- "name": "minibus",
- "slug": "minibus"
- },
- {
- "emoji": "🚑",
- "name": "ambulance",
- "slug": "ambulance"
- },
- {
- "emoji": "🚒",
- "name": "fire engine",
- "slug": "fire_engine"
- },
- {
- "emoji": "🚓",
- "name": "police car",
- "slug": "police_car"
- },
+ { "emoji": "🌇", "name": "sunset", "slug": "sunset" },
+ { "emoji": "🌉", "name": "bridge at night", "slug": "bridge_at_night" },
+ { "emoji": "♨️", "name": "hot springs", "slug": "hot_springs" },
+ { "emoji": "🎠", "name": "carousel horse", "slug": "carousel_horse" },
+ { "emoji": "🛝", "name": "playground slide", "slug": "playground_slide" },
+ { "emoji": "🎡", "name": "ferris wheel", "slug": "ferris_wheel" },
+ { "emoji": "🎢", "name": "roller coaster", "slug": "roller_coaster" },
+ { "emoji": "💈", "name": "barber pole", "slug": "barber_pole" },
+ { "emoji": "🎪", "name": "circus tent", "slug": "circus_tent" },
+ { "emoji": "🚂", "name": "locomotive", "slug": "locomotive" },
+ { "emoji": "🚃", "name": "railway car", "slug": "railway_car" },
+ { "emoji": "🚄", "name": "high-speed train", "slug": "high_speed_train" },
+ { "emoji": "🚅", "name": "bullet train", "slug": "bullet_train" },
+ { "emoji": "🚆", "name": "train", "slug": "train" },
+ { "emoji": "🚇", "name": "metro", "slug": "metro" },
+ { "emoji": "🚈", "name": "light rail", "slug": "light_rail" },
+ { "emoji": "🚉", "name": "station", "slug": "station" },
+ { "emoji": "🚊", "name": "tram", "slug": "tram" },
+ { "emoji": "🚝", "name": "monorail", "slug": "monorail" },
+ { "emoji": "🚞", "name": "mountain railway", "slug": "mountain_railway" },
+ { "emoji": "🚋", "name": "tram car", "slug": "tram_car" },
+ { "emoji": "🚌", "name": "bus", "slug": "bus" },
+ { "emoji": "🚍", "name": "oncoming bus", "slug": "oncoming_bus" },
+ { "emoji": "🚎", "name": "trolleybus", "slug": "trolleybus" },
+ { "emoji": "🚐", "name": "minibus", "slug": "minibus" },
+ { "emoji": "🚑", "name": "ambulance", "slug": "ambulance" },
+ { "emoji": "🚒", "name": "fire engine", "slug": "fire_engine" },
+ { "emoji": "🚓", "name": "police car", "slug": "police_car" },
{
"emoji": "🚔",
"name": "oncoming police car",
"slug": "oncoming_police_car"
},
- {
- "emoji": "🚕",
- "name": "taxi",
- "slug": "taxi"
- },
- {
- "emoji": "🚖",
- "name": "oncoming taxi",
- "slug": "oncoming_taxi"
- },
- {
- "emoji": "🚗",
- "name": "automobile",
- "slug": "automobile"
- },
+ { "emoji": "🚕", "name": "taxi", "slug": "taxi" },
+ { "emoji": "🚖", "name": "oncoming taxi", "slug": "oncoming_taxi" },
+ { "emoji": "🚗", "name": "automobile", "slug": "automobile" },
{
"emoji": "🚘",
"name": "oncoming automobile",
@@ -4467,41 +2311,17 @@
"name": "sport utility vehicle",
"slug": "sport_utility_vehicle"
},
- {
- "emoji": "🛻",
- "name": "pickup truck",
- "slug": "pickup_truck"
- },
- {
- "emoji": "🚚",
- "name": "delivery truck",
- "slug": "delivery_truck"
- },
+ { "emoji": "🛻", "name": "pickup truck", "slug": "pickup_truck" },
+ { "emoji": "🚚", "name": "delivery truck", "slug": "delivery_truck" },
{
"emoji": "🚛",
"name": "articulated lorry",
"slug": "articulated_lorry"
},
- {
- "emoji": "🚜",
- "name": "tractor",
- "slug": "tractor"
- },
- {
- "emoji": "🏎️",
- "name": "racing car",
- "slug": "racing_car"
- },
- {
- "emoji": "🏍️",
- "name": "motorcycle",
- "slug": "motorcycle"
- },
- {
- "emoji": "🛵",
- "name": "motor scooter",
- "slug": "motor_scooter"
- },
+ { "emoji": "🚜", "name": "tractor", "slug": "tractor" },
+ { "emoji": "🏎️", "name": "racing car", "slug": "racing_car" },
+ { "emoji": "🏍️", "name": "motorcycle", "slug": "motorcycle" },
+ { "emoji": "🛵", "name": "motor scooter", "slug": "motor_scooter" },
{
"emoji": "🦽",
"name": "manual wheelchair",
@@ -4512,66 +2332,18 @@
"name": "motorized wheelchair",
"slug": "motorized_wheelchair"
},
- {
- "emoji": "🛺",
- "name": "auto rickshaw",
- "slug": "auto_rickshaw"
- },
- {
- "emoji": "🚲",
- "name": "bicycle",
- "slug": "bicycle"
- },
- {
- "emoji": "🛴",
- "name": "kick scooter",
- "slug": "kick_scooter"
- },
- {
- "emoji": "🛹",
- "name": "skateboard",
- "slug": "skateboard"
- },
- {
- "emoji": "🛼",
- "name": "roller skate",
- "slug": "roller_skate"
- },
- {
- "emoji": "🚏",
- "name": "bus stop",
- "slug": "bus_stop"
- },
- {
- "emoji": "🛣️",
- "name": "motorway",
- "slug": "motorway"
- },
- {
- "emoji": "🛤️",
- "name": "railway track",
- "slug": "railway_track"
- },
- {
- "emoji": "🛢️",
- "name": "oil drum",
- "slug": "oil_drum"
- },
- {
- "emoji": "⛽",
- "name": "fuel pump",
- "slug": "fuel_pump"
- },
- {
- "emoji": "🛞",
- "name": "wheel",
- "slug": "wheel"
- },
- {
- "emoji": "🚨",
- "name": "police car light",
- "slug": "police_car_light"
- },
+ { "emoji": "🛺", "name": "auto rickshaw", "slug": "auto_rickshaw" },
+ { "emoji": "🚲", "name": "bicycle", "slug": "bicycle" },
+ { "emoji": "🛴", "name": "kick scooter", "slug": "kick_scooter" },
+ { "emoji": "🛹", "name": "skateboard", "slug": "skateboard" },
+ { "emoji": "🛼", "name": "roller skate", "slug": "roller_skate" },
+ { "emoji": "🚏", "name": "bus stop", "slug": "bus_stop" },
+ { "emoji": "🛣️", "name": "motorway", "slug": "motorway" },
+ { "emoji": "🛤️", "name": "railway track", "slug": "railway_track" },
+ { "emoji": "🛢️", "name": "oil drum", "slug": "oil_drum" },
+ { "emoji": "⛽️", "name": "fuel pump", "slug": "fuel_pump" },
+ { "emoji": "🛞", "name": "wheel", "slug": "wheel" },
+ { "emoji": "🚨", "name": "police car light", "slug": "police_car_light" },
{
"emoji": "🚥",
"name": "horizontal traffic light",
@@ -4582,96 +2354,28 @@
"name": "vertical traffic light",
"slug": "vertical_traffic_light"
},
- {
- "emoji": "🛑",
- "name": "stop sign",
- "slug": "stop_sign"
- },
- {
- "emoji": "🚧",
- "name": "construction",
- "slug": "construction"
- },
- {
- "emoji": "⚓",
- "name": "anchor",
- "slug": "anchor"
- },
- {
- "emoji": "🛟",
- "name": "ring buoy",
- "slug": "ring_buoy"
- },
- {
- "emoji": "⛵",
- "name": "sailboat",
- "slug": "sailboat"
- },
- {
- "emoji": "🛶",
- "name": "canoe",
- "slug": "canoe"
- },
- {
- "emoji": "🚤",
- "name": "speedboat",
- "slug": "speedboat"
- },
- {
- "emoji": "🛳️",
- "name": "passenger ship",
- "slug": "passenger_ship"
- },
- {
- "emoji": "⛴️",
- "name": "ferry",
- "slug": "ferry"
- },
- {
- "emoji": "🛥️",
- "name": "motor boat",
- "slug": "motor_boat"
- },
- {
- "emoji": "🚢",
- "name": "ship",
- "slug": "ship"
- },
- {
- "emoji": "✈️",
- "name": "airplane",
- "slug": "airplane"
- },
- {
- "emoji": "🛩️",
- "name": "small airplane",
- "slug": "small_airplane"
- },
+ { "emoji": "🛑", "name": "stop sign", "slug": "stop_sign" },
+ { "emoji": "🚧", "name": "construction", "slug": "construction" },
+ { "emoji": "⚓️", "name": "anchor", "slug": "anchor" },
+ { "emoji": "🛟", "name": "ring buoy", "slug": "ring_buoy" },
+ { "emoji": "⛵️", "name": "sailboat", "slug": "sailboat" },
+ { "emoji": "🛶", "name": "canoe", "slug": "canoe" },
+ { "emoji": "🚤", "name": "speedboat", "slug": "speedboat" },
+ { "emoji": "🛳️", "name": "passenger ship", "slug": "passenger_ship" },
+ { "emoji": "⛴️", "name": "ferry", "slug": "ferry" },
+ { "emoji": "🛥️", "name": "motor boat", "slug": "motor_boat" },
+ { "emoji": "🚢", "name": "ship", "slug": "ship" },
+ { "emoji": "✈️", "name": "airplane", "slug": "airplane" },
+ { "emoji": "🛩️", "name": "small airplane", "slug": "small_airplane" },
{
"emoji": "🛫",
"name": "airplane departure",
"slug": "airplane_departure"
},
- {
- "emoji": "🛬",
- "name": "airplane arrival",
- "slug": "airplane_arrival"
- },
- {
- "emoji": "🪂",
- "name": "parachute",
- "slug": "parachute"
- },
- {
- "emoji": "💺",
- "name": "seat",
- "slug": "seat"
- },
- {
- "emoji": "🚁",
- "name": "helicopter",
- "slug": "helicopter"
- },
+ { "emoji": "🛬", "name": "airplane arrival", "slug": "airplane_arrival" },
+ { "emoji": "🪂", "name": "parachute", "slug": "parachute" },
+ { "emoji": "💺", "name": "seat", "slug": "seat" },
+ { "emoji": "🚁", "name": "helicopter", "slug": "helicopter" },
{
"emoji": "🚟",
"name": "suspension railway",
@@ -4682,66 +2386,22 @@
"name": "mountain cableway",
"slug": "mountain_cableway"
},
+ { "emoji": "🚡", "name": "aerial tramway", "slug": "aerial_tramway" },
+ { "emoji": "🛰️", "name": "satellite", "slug": "satellite" },
+ { "emoji": "🚀", "name": "rocket", "slug": "rocket" },
+ { "emoji": "🛸", "name": "flying saucer", "slug": "flying_saucer" },
+ { "emoji": "🛎️", "name": "bellhop bell", "slug": "bellhop_bell" },
+ { "emoji": "🧳", "name": "luggage", "slug": "luggage" },
+ { "emoji": "⌛️", "name": "hourglass done", "slug": "hourglass_done" },
{
- "emoji": "🚡",
- "name": "aerial tramway",
- "slug": "aerial_tramway"
- },
- {
- "emoji": "🛰️",
- "name": "satellite",
- "slug": "satellite"
- },
- {
- "emoji": "🚀",
- "name": "rocket",
- "slug": "rocket"
- },
- {
- "emoji": "🛸",
- "name": "flying saucer",
- "slug": "flying_saucer"
- },
- {
- "emoji": "🛎️",
- "name": "bellhop bell",
- "slug": "bellhop_bell"
- },
- {
- "emoji": "🧳",
- "name": "luggage",
- "slug": "luggage"
- },
- {
- "emoji": "⌛",
- "name": "hourglass done",
- "slug": "hourglass_done"
- },
- {
- "emoji": "⏳",
+ "emoji": "⏳️",
"name": "hourglass not done",
"slug": "hourglass_not_done"
},
- {
- "emoji": "⌚",
- "name": "watch",
- "slug": "watch_clock"
- },
- {
- "emoji": "⏰",
- "name": "alarm clock",
- "slug": "alarm_clock"
- },
- {
- "emoji": "⏱️",
- "name": "stopwatch",
- "slug": "stopwatch"
- },
- {
- "emoji": "⏲️",
- "name": "timer clock",
- "slug": "timer_clock"
- },
+ { "emoji": "⌚️", "name": "watch", "slug": "watch_clock" },
+ { "emoji": "⏰️", "name": "alarm clock", "slug": "alarm_clock" },
+ { "emoji": "⏱️", "name": "stopwatch", "slug": "stopwatch" },
+ { "emoji": "⏲️", "name": "timer clock", "slug": "timer_clock" },
{
"emoji": "🕰️",
"name": "mantelpiece clock",
@@ -4757,106 +2417,54 @@
"name": "twelve-thirty",
"slug": "twelve_thirty_12_12:30"
},
- {
- "emoji": "🕐",
- "name": "one o’clock",
- "slug": "one_o_clock_00_1_1:00"
- },
- {
- "emoji": "🕜",
- "name": "one-thirty",
- "slug": "one_thirty_1_1:30"
- },
- {
- "emoji": "🕑",
- "name": "two o’clock",
- "slug": "two_o_clock_00_2_2:00"
- },
- {
- "emoji": "🕝",
- "name": "two-thirty",
- "slug": "two_thirty_2_2:30"
- },
+ { "emoji": "🕐", "name": "one o’clock", "slug": "one_o_clock_00_1_1:00" },
+ { "emoji": "🕜", "name": "one-thirty", "slug": "one_thirty_1_1:30" },
+ { "emoji": "🕑", "name": "two o’clock", "slug": "two_o_clock_00_2_2:00" },
+ { "emoji": "🕝", "name": "two-thirty", "slug": "two_thirty_2_2:30" },
{
"emoji": "🕒",
"name": "three o’clock",
"slug": "three_o_clock_00_3_3:00"
},
- {
- "emoji": "🕞",
- "name": "three-thirty",
- "slug": "three_thirty_3_3:30"
- },
+ { "emoji": "🕞", "name": "three-thirty", "slug": "three_thirty_3_3:30" },
{
"emoji": "🕓",
"name": "four o’clock",
"slug": "four_o_clock_00_4_4:00"
},
- {
- "emoji": "🕟",
- "name": "four-thirty",
- "slug": "four_thirty_4_4:30"
- },
+ { "emoji": "🕟", "name": "four-thirty", "slug": "four_thirty_4_4:30" },
{
"emoji": "🕔",
"name": "five o’clock",
"slug": "five_o_clock_00_5_5:00"
},
- {
- "emoji": "🕠",
- "name": "five-thirty",
- "slug": "five_thirty_5_5:30"
- },
- {
- "emoji": "🕕",
- "name": "six o’clock",
- "slug": "six_o_clock_00_6_6:00"
- },
- {
- "emoji": "🕡",
- "name": "six-thirty",
- "slug": "six_thirty_6_6:30"
- },
+ { "emoji": "🕠", "name": "five-thirty", "slug": "five_thirty_5_5:30" },
+ { "emoji": "🕕", "name": "six o’clock", "slug": "six_o_clock_00_6_6:00" },
+ { "emoji": "🕡", "name": "six-thirty", "slug": "six_thirty_6_6:30" },
{
"emoji": "🕖",
"name": "seven o’clock",
"slug": "seven_o_clock_00_7_7:00"
},
- {
- "emoji": "🕢",
- "name": "seven-thirty",
- "slug": "seven_thirty_7_7:30"
- },
+ { "emoji": "🕢", "name": "seven-thirty", "slug": "seven_thirty_7_7:30" },
{
"emoji": "🕗",
"name": "eight o’clock",
"slug": "eight_o_clock_00_8_8:00"
},
- {
- "emoji": "🕣",
- "name": "eight-thirty",
- "slug": "eight_thirty_8_8:30"
- },
+ { "emoji": "🕣", "name": "eight-thirty", "slug": "eight_thirty_8_8:30" },
{
"emoji": "🕘",
"name": "nine o’clock",
"slug": "nine_o_clock_00_9_9:00"
},
- {
- "emoji": "🕤",
- "name": "nine-thirty",
- "slug": "nine_thirty_9_9:30"
- },
+ { "emoji": "🕤", "name": "nine-thirty", "slug": "nine_thirty_9_9:30" },
{
"emoji": "🕙",
"name": "ten o’clock",
"slug": "ten_o_clock_00_10_10:00"
},
- {
- "emoji": "🕥",
- "name": "ten-thirty",
- "slug": "ten_thirty_10_10:30"
- },
+ { "emoji": "🕥", "name": "ten-thirty", "slug": "ten_thirty_10_10:30" },
{
"emoji": "🕚",
"name": "eleven o’clock",
@@ -4867,11 +2475,7 @@
"name": "eleven-thirty",
"slug": "eleven_thirty_11_11:30"
},
- {
- "emoji": "🌑",
- "name": "new moon",
- "slug": "new_moon_dark"
- },
+ { "emoji": "🌑", "name": "new moon", "slug": "new_moon_dark" },
{
"emoji": "🌒",
"name": "waxing crescent moon",
@@ -4887,11 +2491,7 @@
"name": "waxing gibbous moon",
"slug": "waxing_gibbous_moon"
},
- {
- "emoji": "🌕",
- "name": "full moon",
- "slug": "full_moon"
- },
+ { "emoji": "🌕", "name": "full moon", "slug": "full_moon" },
{
"emoji": "🌖",
"name": "waning gibbous moon",
@@ -4907,16 +2507,8 @@
"name": "waning crescent moon",
"slug": "waning_crescent_moon"
},
- {
- "emoji": "🌙",
- "name": "crescent moon",
- "slug": "crescent_moon"
- },
- {
- "emoji": "🌚",
- "name": "new moon face",
- "slug": "new_moon_face"
- },
+ { "emoji": "🌙", "name": "crescent moon", "slug": "crescent_moon" },
+ { "emoji": "🌚", "name": "new moon face", "slug": "new_moon_face" },
{
"emoji": "🌛",
"name": "first quarter moon face",
@@ -4927,58 +2519,18 @@
"name": "last quarter moon face",
"slug": "last_quarter_moon_face"
},
+ { "emoji": "🌡️", "name": "thermometer", "slug": "thermometer" },
+ { "emoji": "☀️", "name": "sun", "slug": "sun" },
+ { "emoji": "🌝", "name": "full moon face", "slug": "full_moon_face" },
+ { "emoji": "🌞", "name": "sun with face", "slug": "sun_with_face" },
+ { "emoji": "🪐", "name": "ringed planet", "slug": "ringed_planet" },
+ { "emoji": "⭐️", "name": "star", "slug": "star" },
+ { "emoji": "🌟", "name": "glowing star", "slug": "glowing_star" },
+ { "emoji": "🌠", "name": "shooting star", "slug": "shooting_star" },
+ { "emoji": "🌌", "name": "milky way", "slug": "milky_way" },
+ { "emoji": "☁️", "name": "cloud", "slug": "cloud" },
{
- "emoji": "🌡️",
- "name": "thermometer",
- "slug": "thermometer"
- },
- {
- "emoji": "☀️",
- "name": "sun",
- "slug": "sun"
- },
- {
- "emoji": "🌝",
- "name": "full moon face",
- "slug": "full_moon_face"
- },
- {
- "emoji": "🌞",
- "name": "sun with face",
- "slug": "sun_with_face"
- },
- {
- "emoji": "🪐",
- "name": "ringed planet",
- "slug": "ringed_planet"
- },
- {
- "emoji": "⭐",
- "name": "star",
- "slug": "star"
- },
- {
- "emoji": "🌟",
- "name": "glowing star",
- "slug": "glowing_star"
- },
- {
- "emoji": "🌠",
- "name": "shooting star",
- "slug": "shooting_star"
- },
- {
- "emoji": "🌌",
- "name": "milky way",
- "slug": "milky_way"
- },
- {
- "emoji": "☁️",
- "name": "cloud",
- "slug": "cloud"
- },
- {
- "emoji": "⛅",
+ "emoji": "⛅️",
"name": "sun behind cloud",
"slug": "sun_behind_cloud"
},
@@ -5002,58 +2554,22 @@
"name": "sun behind rain cloud",
"slug": "sun_behind_rain_cloud"
},
- {
- "emoji": "🌧️",
- "name": "cloud with rain",
- "slug": "cloud_with_rain"
- },
- {
- "emoji": "🌨️",
- "name": "cloud with snow",
- "slug": "cloud_with_snow"
- },
+ { "emoji": "🌧️", "name": "cloud with rain", "slug": "cloud_with_rain" },
+ { "emoji": "🌨️", "name": "cloud with snow", "slug": "cloud_with_snow" },
{
"emoji": "🌩️",
"name": "cloud with lightning",
"slug": "cloud_with_lightning"
},
+ { "emoji": "🌪️", "name": "tornado", "slug": "tornado" },
+ { "emoji": "🌫️", "name": "fog", "slug": "fog" },
+ { "emoji": "🌬️", "name": "wind face", "slug": "wind_face" },
+ { "emoji": "🌀", "name": "cyclone", "slug": "cyclone" },
+ { "emoji": "🌈", "name": "rainbow", "slug": "rainbow" },
+ { "emoji": "🌂", "name": "closed umbrella", "slug": "closed_umbrella" },
+ { "emoji": "☂️", "name": "umbrella", "slug": "umbrella" },
{
- "emoji": "🌪️",
- "name": "tornado",
- "slug": "tornado"
- },
- {
- "emoji": "🌫️",
- "name": "fog",
- "slug": "fog"
- },
- {
- "emoji": "🌬️",
- "name": "wind face",
- "slug": "wind_face"
- },
- {
- "emoji": "🌀",
- "name": "cyclone",
- "slug": "cyclone"
- },
- {
- "emoji": "🌈",
- "name": "rainbow",
- "slug": "rainbow"
- },
- {
- "emoji": "🌂",
- "name": "closed umbrella",
- "slug": "closed_umbrella"
- },
- {
- "emoji": "☂️",
- "name": "umbrella",
- "slug": "umbrella"
- },
- {
- "emoji": "☔",
+ "emoji": "☔️",
"name": "umbrella with rain drops",
"slug": "umbrella_with_rain_drops"
},
@@ -5062,46 +2578,18 @@
"name": "umbrella on ground",
"slug": "umbrella_on_ground"
},
+ { "emoji": "⚡️", "name": "high voltage", "slug": "high_voltage" },
+ { "emoji": "❄️", "name": "snowflake", "slug": "snowflake" },
+ { "emoji": "☃️", "name": "snowman", "slug": "snowman" },
{
- "emoji": "⚡",
- "name": "high voltage",
- "slug": "high_voltage"
- },
- {
- "emoji": "❄️",
- "name": "snowflake",
- "slug": "snowflake"
- },
- {
- "emoji": "☃️",
- "name": "snowman",
- "slug": "snowman"
- },
- {
- "emoji": "⛄",
+ "emoji": "⛄️",
"name": "snowman without snow",
"slug": "snowman_without_snow"
},
- {
- "emoji": "☄️",
- "name": "comet",
- "slug": "comet"
- },
- {
- "emoji": "🔥",
- "name": "fire",
- "slug": "fire"
- },
- {
- "emoji": "💧",
- "name": "droplet",
- "slug": "droplet"
- },
- {
- "emoji": "🌊",
- "name": "water wave",
- "slug": "water_wave"
- }
+ { "emoji": "☄️", "name": "comet", "slug": "comet" },
+ { "emoji": "🔥", "name": "fire", "slug": "fire" },
+ { "emoji": "💧", "name": "droplet", "slug": "droplet" },
+ { "emoji": "🌊", "name": "water wave", "slug": "water_wave" }
]
},
{
@@ -5113,36 +2601,12 @@
"name": "jack-o-lantern",
"slug": "jack_o_lantern_halloween_jack"
},
- {
- "emoji": "🎄",
- "name": "Christmas tree",
- "slug": "christmas_tree"
- },
- {
- "emoji": "🎆",
- "name": "fireworks",
- "slug": "fireworks_celebration"
- },
- {
- "emoji": "🎇",
- "name": "sparkler",
- "slug": "sparkler_celebration"
- },
- {
- "emoji": "🧨",
- "name": "firecracker",
- "slug": "firecracker_explosive"
- },
- {
- "emoji": "✨",
- "name": "sparkles",
- "slug": "sparkles_star"
- },
- {
- "emoji": "🎈",
- "name": "balloon",
- "slug": "balloon"
- },
+ { "emoji": "🎄", "name": "Christmas tree", "slug": "christmas_tree" },
+ { "emoji": "🎆", "name": "fireworks", "slug": "fireworks_celebration" },
+ { "emoji": "🎇", "name": "sparkler", "slug": "sparkler_celebration" },
+ { "emoji": "🧨", "name": "firecracker", "slug": "firecracker_explosive" },
+ { "emoji": "✨️", "name": "sparkles", "slug": "sparkles_star" },
+ { "emoji": "🎈", "name": "balloon", "slug": "balloon" },
{
"emoji": "🎉",
"name": "party popper",
@@ -5153,341 +2617,89 @@
"name": "confetti ball",
"slug": "confetti_ball_celebration"
},
- {
- "emoji": "🎋",
- "name": "tanabata tree",
- "slug": "tanabata_tree"
- },
- {
- "emoji": "🎍",
- "name": "pine decoration",
- "slug": "pine_decoration"
- },
- {
- "emoji": "🎎",
- "name": "Japanese dolls",
- "slug": "japanese_dolls"
- },
- {
- "emoji": "🎏",
- "name": "carp streamer",
- "slug": "carp_streamer"
- },
- {
- "emoji": "🎐",
- "name": "wind chime",
- "slug": "wind_chime"
- },
+ { "emoji": "🎋", "name": "tanabata tree", "slug": "tanabata_tree" },
+ { "emoji": "🎍", "name": "pine decoration", "slug": "pine_decoration" },
+ { "emoji": "🎎", "name": "Japanese dolls", "slug": "japanese_dolls" },
+ { "emoji": "🎏", "name": "carp streamer", "slug": "carp_streamer" },
+ { "emoji": "🎐", "name": "wind chime", "slug": "wind_chime" },
{
"emoji": "🎑",
"name": "moon viewing ceremony",
"slug": "moon_viewing_ceremony"
},
- {
- "emoji": "🧧",
- "name": "red envelope",
- "slug": "red_envelope"
- },
- {
- "emoji": "🎀",
- "name": "ribbon",
- "slug": "ribbon_celebration"
- },
- {
- "emoji": "🎁",
- "name": "wrapped gift",
- "slug": "wrapped_gift"
- },
- {
- "emoji": "🎗️",
- "name": "reminder ribbon",
- "slug": "reminder_ribbon"
- },
+ { "emoji": "🧧", "name": "red envelope", "slug": "red_envelope" },
+ { "emoji": "🎀", "name": "ribbon", "slug": "ribbon_celebration" },
+ { "emoji": "🎁", "name": "wrapped gift", "slug": "wrapped_gift" },
+ { "emoji": "🎗️", "name": "reminder ribbon", "slug": "reminder_ribbon" },
{
"emoji": "🎟️",
"name": "admission tickets",
"slug": "admission_tickets"
},
- {
- "emoji": "🎫",
- "name": "ticket",
- "slug": "ticket"
- },
- {
- "emoji": "🎖️",
- "name": "military medal",
- "slug": "military_medal"
- },
- {
- "emoji": "🏆",
- "name": "trophy",
- "slug": "trophy"
- },
- {
- "emoji": "🏅",
- "name": "sports medal",
- "slug": "sports_medal"
- },
- {
- "emoji": "🥇",
- "name": "1st place medal",
- "slug": "1st_place_medal"
- },
- {
- "emoji": "🥈",
- "name": "2nd place medal",
- "slug": "2nd_place_medal"
- },
- {
- "emoji": "🥉",
- "name": "3rd place medal",
- "slug": "3rd_place_medal"
- },
- {
- "emoji": "⚽",
- "name": "soccer ball",
- "slug": "soccer_ball"
- },
- {
- "emoji": "⚾",
- "name": "baseball",
- "slug": "baseball"
- },
- {
- "emoji": "🥎",
- "name": "softball",
- "slug": "softball"
- },
- {
- "emoji": "🏀",
- "name": "basketball",
- "slug": "basketball"
- },
- {
- "emoji": "🏐",
- "name": "volleyball",
- "slug": "volleyball"
- },
+ { "emoji": "🎫", "name": "ticket", "slug": "ticket" },
+ { "emoji": "🎖️", "name": "military medal", "slug": "military_medal" },
+ { "emoji": "🏆", "name": "trophy", "slug": "trophy" },
+ { "emoji": "🏅", "name": "sports medal", "slug": "sports_medal" },
+ { "emoji": "🥇", "name": "1st place medal", "slug": "1st_place_medal" },
+ { "emoji": "🥈", "name": "2nd place medal", "slug": "2nd_place_medal" },
+ { "emoji": "🥉", "name": "3rd place medal", "slug": "3rd_place_medal" },
+ { "emoji": "⚽️", "name": "soccer ball", "slug": "soccer_ball" },
+ { "emoji": "⚾️", "name": "baseball", "slug": "baseball" },
+ { "emoji": "🥎", "name": "softball", "slug": "softball" },
+ { "emoji": "🏀", "name": "basketball", "slug": "basketball" },
+ { "emoji": "🏐", "name": "volleyball", "slug": "volleyball" },
{
"emoji": "🏈",
"name": "american football",
"slug": "american_football"
},
- {
- "emoji": "🏉",
- "name": "rugby football",
- "slug": "rugby_football"
- },
- {
- "emoji": "🎾",
- "name": "tennis",
- "slug": "tennis"
- },
- {
- "emoji": "🥏",
- "name": "flying disc",
- "slug": "flying_disc"
- },
- {
- "emoji": "🎳",
- "name": "bowling",
- "slug": "bowling"
- },
- {
- "emoji": "🏏",
- "name": "cricket game",
- "slug": "cricket_game"
- },
- {
- "emoji": "🏑",
- "name": "field hockey",
- "slug": "field_hockey"
- },
- {
- "emoji": "🏒",
- "name": "ice hockey",
- "slug": "ice_hockey"
- },
- {
- "emoji": "🥍",
- "name": "lacrosse",
- "slug": "lacrosse"
- },
- {
- "emoji": "🏓",
- "name": "ping pong",
- "slug": "ping_pong"
- },
- {
- "emoji": "🏸",
- "name": "badminton",
- "slug": "badminton"
- },
- {
- "emoji": "🥊",
- "name": "boxing glove",
- "slug": "boxing_glove"
- },
+ { "emoji": "🏉", "name": "rugby football", "slug": "rugby_football" },
+ { "emoji": "🎾", "name": "tennis", "slug": "tennis" },
+ { "emoji": "🥏", "name": "flying disc", "slug": "flying_disc" },
+ { "emoji": "🎳", "name": "bowling", "slug": "bowling" },
+ { "emoji": "🏏", "name": "cricket game", "slug": "cricket_game" },
+ { "emoji": "🏑", "name": "field hockey", "slug": "field_hockey" },
+ { "emoji": "🏒", "name": "ice hockey", "slug": "ice_hockey" },
+ { "emoji": "🥍", "name": "lacrosse", "slug": "lacrosse" },
+ { "emoji": "🏓", "name": "ping pong", "slug": "ping_pong" },
+ { "emoji": "🏸", "name": "badminton", "slug": "badminton" },
+ { "emoji": "🥊", "name": "boxing glove", "slug": "boxing_glove" },
{
"emoji": "🥋",
"name": "martial arts uniform",
"slug": "martial_arts_uniform"
},
- {
- "emoji": "🥅",
- "name": "goal net",
- "slug": "goal_net"
- },
- {
- "emoji": "⛳",
- "name": "flag in hole",
- "slug": "flag_in_hole"
- },
- {
- "emoji": "⛸️",
- "name": "ice skate",
- "slug": "ice_skate"
- },
- {
- "emoji": "🎣",
- "name": "fishing pole",
- "slug": "fishing_pole"
- },
- {
- "emoji": "🤿",
- "name": "diving mask",
- "slug": "diving_mask"
- },
- {
- "emoji": "🎽",
- "name": "running shirt",
- "slug": "running_shirt"
- },
- {
- "emoji": "🎿",
- "name": "skis",
- "slug": "skis"
- },
- {
- "emoji": "🛷",
- "name": "sled",
- "slug": "sled"
- },
- {
- "emoji": "🥌",
- "name": "curling stone",
- "slug": "curling_stone"
- },
- {
- "emoji": "🎯",
- "name": "bullseye",
- "slug": "bullseye"
- },
- {
- "emoji": "🪀",
- "name": "yo-yo",
- "slug": "yo_yo"
- },
- {
- "emoji": "🪁",
- "name": "kite",
- "slug": "kite"
- },
- {
- "emoji": "🔫",
- "name": "water pistol",
- "slug": "water_pistol"
- },
- {
- "emoji": "🎱",
- "name": "pool 8 ball",
- "slug": "pool_8_ball"
- },
- {
- "emoji": "🔮",
- "name": "crystal ball",
- "slug": "crystal_ball"
- },
- {
- "emoji": "🪄",
- "name": "magic wand",
- "slug": "magic_wand"
- },
- {
- "emoji": "🎮",
- "name": "video game",
- "slug": "video_game"
- },
- {
- "emoji": "🕹️",
- "name": "joystick",
- "slug": "joystick"
- },
- {
- "emoji": "🎰",
- "name": "slot machine",
- "slug": "slot_machine"
- },
- {
- "emoji": "🎲",
- "name": "game die",
- "slug": "game_die"
- },
- {
- "emoji": "🧩",
- "name": "puzzle piece",
- "slug": "puzzle_piece"
- },
- {
- "emoji": "🧸",
- "name": "teddy bear",
- "slug": "teddy_bear"
- },
- {
- "emoji": "🪅",
- "name": "piñata",
- "slug": "pinata"
- },
- {
- "emoji": "🪩",
- "name": "mirror ball",
- "slug": "mirror_ball"
- },
- {
- "emoji": "🪆",
- "name": "nesting dolls",
- "slug": "nesting_dolls"
- },
- {
- "emoji": "♠️",
- "name": "spade suit",
- "slug": "spade_suit"
- },
- {
- "emoji": "♥️",
- "name": "heart suit",
- "slug": "heart_suit"
- },
- {
- "emoji": "♦️",
- "name": "diamond suit",
- "slug": "diamond_suit"
- },
- {
- "emoji": "♣️",
- "name": "club suit",
- "slug": "club_suit"
- },
- {
- "emoji": "♟️",
- "name": "chess pawn",
- "slug": "chess_pawn"
- },
- {
- "emoji": "🃏",
- "name": "joker",
- "slug": "joker"
- },
+ { "emoji": "🥅", "name": "goal net", "slug": "goal_net" },
+ { "emoji": "⛳️", "name": "flag in hole", "slug": "flag_in_hole" },
+ { "emoji": "⛸️", "name": "ice skate", "slug": "ice_skate" },
+ { "emoji": "🎣", "name": "fishing pole", "slug": "fishing_pole" },
+ { "emoji": "🤿", "name": "diving mask", "slug": "diving_mask" },
+ { "emoji": "🎽", "name": "running shirt", "slug": "running_shirt" },
+ { "emoji": "🎿", "name": "skis", "slug": "skis" },
+ { "emoji": "🛷", "name": "sled", "slug": "sled" },
+ { "emoji": "🥌", "name": "curling stone", "slug": "curling_stone" },
+ { "emoji": "🎯", "name": "bullseye", "slug": "bullseye" },
+ { "emoji": "🪀", "name": "yo-yo", "slug": "yo_yo" },
+ { "emoji": "🪁", "name": "kite", "slug": "kite" },
+ { "emoji": "🔫", "name": "water pistol", "slug": "water_pistol" },
+ { "emoji": "🎱", "name": "pool 8 ball", "slug": "pool_8_ball" },
+ { "emoji": "🔮", "name": "crystal ball", "slug": "crystal_ball" },
+ { "emoji": "🪄", "name": "magic wand", "slug": "magic_wand" },
+ { "emoji": "🎮", "name": "video game", "slug": "video_game" },
+ { "emoji": "🕹️", "name": "joystick", "slug": "joystick" },
+ { "emoji": "🎰", "name": "slot machine", "slug": "slot_machine" },
+ { "emoji": "🎲", "name": "game die", "slug": "game_die" },
+ { "emoji": "🧩", "name": "puzzle piece", "slug": "puzzle_piece" },
+ { "emoji": "🧸", "name": "teddy bear", "slug": "teddy_bear" },
+ { "emoji": "🪅", "name": "piñata", "slug": "pinata" },
+ { "emoji": "🪩", "name": "mirror ball", "slug": "mirror_ball" },
+ { "emoji": "🪆", "name": "nesting dolls", "slug": "nesting_dolls" },
+ { "emoji": "♠️", "name": "spade suit", "slug": "spade_suit" },
+ { "emoji": "♥️", "name": "heart suit", "slug": "heart_suit" },
+ { "emoji": "♦️", "name": "diamond suit", "slug": "diamond_suit" },
+ { "emoji": "♣️", "name": "club suit", "slug": "club_suit" },
+ { "emoji": "♟️", "name": "chess pawn", "slug": "chess_pawn" },
+ { "emoji": "🃏", "name": "joker", "slug": "joker" },
{
"emoji": "🀄",
"name": "mahjong red dragon",
@@ -5498,277 +2710,73 @@
"name": "flower playing cards",
"slug": "flower_playing_cards"
},
- {
- "emoji": "🎭",
- "name": "performing arts",
- "slug": "performing_arts"
- },
- {
- "emoji": "🖼️",
- "name": "framed picture",
- "slug": "framed_picture"
- },
- {
- "emoji": "🎨",
- "name": "artist palette",
- "slug": "artist_palette"
- },
- {
- "emoji": "🧵",
- "name": "thread",
- "slug": "thread"
- },
- {
- "emoji": "🪡",
- "name": "sewing needle",
- "slug": "sewing_needle"
- },
- {
- "emoji": "🧶",
- "name": "yarn",
- "slug": "yarn"
- },
- {
- "emoji": "🪢",
- "name": "knot",
- "slug": "knot"
- }
+ { "emoji": "🎭", "name": "performing arts", "slug": "performing_arts" },
+ { "emoji": "🖼️", "name": "framed picture", "slug": "framed_picture" },
+ { "emoji": "🎨", "name": "artist palette", "slug": "artist_palette" },
+ { "emoji": "🧵", "name": "thread", "slug": "thread" },
+ { "emoji": "🪡", "name": "sewing needle", "slug": "sewing_needle" },
+ { "emoji": "🧶", "name": "yarn", "slug": "yarn" },
+ { "emoji": "🪢", "name": "knot", "slug": "knot" }
]
},
{
"name": "Objects",
"slug": "objects",
"emojis": [
- {
- "emoji": "👓",
- "name": "glasses",
- "slug": "glasses"
- },
- {
- "emoji": "🕶️",
- "name": "sunglasses",
- "slug": "sunglasses"
- },
- {
- "emoji": "🥽",
- "name": "goggles",
- "slug": "goggles"
- },
- {
- "emoji": "🥼",
- "name": "lab coat",
- "slug": "lab_coat"
- },
- {
- "emoji": "🦺",
- "name": "safety vest",
- "slug": "safety_vest"
- },
- {
- "emoji": "👔",
- "name": "necktie",
- "slug": "necktie"
- },
- {
- "emoji": "👕",
- "name": "t-shirt",
- "slug": "t_shirt"
- },
- {
- "emoji": "👖",
- "name": "jeans",
- "slug": "jeans"
- },
- {
- "emoji": "🧣",
- "name": "scarf",
- "slug": "scarf"
- },
- {
- "emoji": "🧤",
- "name": "gloves",
- "slug": "gloves"
- },
- {
- "emoji": "🧥",
- "name": "coat",
- "slug": "coat"
- },
- {
- "emoji": "🧦",
- "name": "socks",
- "slug": "socks"
- },
- {
- "emoji": "👗",
- "name": "dress",
- "slug": "dress"
- },
- {
- "emoji": "👘",
- "name": "kimono",
- "slug": "kimono"
- },
- {
- "emoji": "🥻",
- "name": "sari",
- "slug": "sari"
- },
+ { "emoji": "👓", "name": "glasses", "slug": "glasses" },
+ { "emoji": "🕶️", "name": "sunglasses", "slug": "sunglasses" },
+ { "emoji": "🥽", "name": "goggles", "slug": "goggles" },
+ { "emoji": "🥼", "name": "lab coat", "slug": "lab_coat" },
+ { "emoji": "🦺", "name": "safety vest", "slug": "safety_vest" },
+ { "emoji": "👔", "name": "necktie", "slug": "necktie" },
+ { "emoji": "👕", "name": "t-shirt", "slug": "t_shirt" },
+ { "emoji": "👖", "name": "jeans", "slug": "jeans" },
+ { "emoji": "🧣", "name": "scarf", "slug": "scarf" },
+ { "emoji": "🧤", "name": "gloves", "slug": "gloves" },
+ { "emoji": "🧥", "name": "coat", "slug": "coat" },
+ { "emoji": "🧦", "name": "socks", "slug": "socks" },
+ { "emoji": "👗", "name": "dress", "slug": "dress" },
+ { "emoji": "👘", "name": "kimono", "slug": "kimono" },
+ { "emoji": "🥻", "name": "sari", "slug": "sari" },
{
"emoji": "🩱",
"name": "one-piece swimsuit",
"slug": "one_piece_swimsuit"
},
- {
- "emoji": "🩲",
- "name": "briefs",
- "slug": "briefs"
- },
- {
- "emoji": "🩳",
- "name": "shorts",
- "slug": "shorts"
- },
- {
- "emoji": "👙",
- "name": "bikini",
- "slug": "bikini"
- },
- {
- "emoji": "👚",
- "name": "woman’s clothes",
- "slug": "woman_s_clothes"
- },
- {
- "emoji": "👛",
- "name": "purse",
- "slug": "purse"
- },
- {
- "emoji": "👜",
- "name": "handbag",
- "slug": "handbag"
- },
- {
- "emoji": "👝",
- "name": "clutch bag",
- "slug": "clutch_bag"
- },
- {
- "emoji": "🛍️",
- "name": "shopping bags",
- "slug": "shopping_bags"
- },
- {
- "emoji": "🎒",
- "name": "backpack",
- "slug": "backpack"
- },
- {
- "emoji": "🩴",
- "name": "thong sandal",
- "slug": "thong_sandal"
- },
- {
- "emoji": "👞",
- "name": "man’s shoe",
- "slug": "man_s_shoe"
- },
- {
- "emoji": "👟",
- "name": "running shoe",
- "slug": "running_shoe"
- },
- {
- "emoji": "🥾",
- "name": "hiking boot",
- "slug": "hiking_boot"
- },
- {
- "emoji": "🥿",
- "name": "flat shoe",
- "slug": "flat_shoe"
- },
- {
- "emoji": "👠",
- "name": "high-heeled shoe",
- "slug": "high_heeled_shoe"
- },
- {
- "emoji": "👡",
- "name": "woman’s sandal",
- "slug": "woman_s_sandal"
- },
- {
- "emoji": "🩰",
- "name": "ballet shoes",
- "slug": "ballet_shoes"
- },
- {
- "emoji": "👢",
- "name": "woman’s boot",
- "slug": "woman_s_boot"
- },
- {
- "emoji": "👑",
- "name": "crown",
- "slug": "crown"
- },
- {
- "emoji": "👒",
- "name": "woman’s hat",
- "slug": "woman_s_hat"
- },
- {
- "emoji": "🎩",
- "name": "top hat",
- "slug": "top_hat"
- },
- {
- "emoji": "🎓",
- "name": "graduation cap",
- "slug": "graduation_cap"
- },
- {
- "emoji": "🧢",
- "name": "billed cap",
- "slug": "billed_cap"
- },
- {
- "emoji": "🪖",
- "name": "military helmet",
- "slug": "military_helmet"
- },
+ { "emoji": "🩲", "name": "briefs", "slug": "briefs" },
+ { "emoji": "🩳", "name": "shorts", "slug": "shorts" },
+ { "emoji": "👙", "name": "bikini", "slug": "bikini" },
+ { "emoji": "👚", "name": "woman’s clothes", "slug": "woman_s_clothes" },
+ { "emoji": "👛", "name": "purse", "slug": "purse" },
+ { "emoji": "👜", "name": "handbag", "slug": "handbag" },
+ { "emoji": "👝", "name": "clutch bag", "slug": "clutch_bag" },
+ { "emoji": "🛍️", "name": "shopping bags", "slug": "shopping_bags" },
+ { "emoji": "🎒", "name": "backpack", "slug": "backpack" },
+ { "emoji": "🩴", "name": "thong sandal", "slug": "thong_sandal" },
+ { "emoji": "👞", "name": "man’s shoe", "slug": "man_s_shoe" },
+ { "emoji": "👟", "name": "running shoe", "slug": "running_shoe" },
+ { "emoji": "🥾", "name": "hiking boot", "slug": "hiking_boot" },
+ { "emoji": "🥿", "name": "flat shoe", "slug": "flat_shoe" },
+ { "emoji": "👠", "name": "high-heeled shoe", "slug": "high_heeled_shoe" },
+ { "emoji": "👡", "name": "woman’s sandal", "slug": "woman_s_sandal" },
+ { "emoji": "🩰", "name": "ballet shoes", "slug": "ballet_shoes" },
+ { "emoji": "👢", "name": "woman’s boot", "slug": "woman_s_boot" },
+ { "emoji": "👑", "name": "crown", "slug": "crown" },
+ { "emoji": "👒", "name": "woman’s hat", "slug": "woman_s_hat" },
+ { "emoji": "🎩", "name": "top hat", "slug": "top_hat" },
+ { "emoji": "🎓", "name": "graduation cap", "slug": "graduation_cap" },
+ { "emoji": "🧢", "name": "billed cap", "slug": "billed_cap" },
+ { "emoji": "🪖", "name": "military helmet", "slug": "military_helmet" },
{
"emoji": "⛑️",
"name": "rescue worker’s helmet",
"slug": "rescue_worker_s_helmet"
},
- {
- "emoji": "📿",
- "name": "prayer beads",
- "slug": "prayer_beads"
- },
- {
- "emoji": "💄",
- "name": "lipstick",
- "slug": "lipstick"
- },
- {
- "emoji": "💍",
- "name": "ring",
- "slug": "ring"
- },
- {
- "emoji": "💎",
- "name": "gem stone",
- "slug": "gem_stone"
- },
- {
- "emoji": "🔇",
- "name": "muted speaker",
- "slug": "muted_speaker"
- },
+ { "emoji": "📿", "name": "prayer beads", "slug": "prayer_beads" },
+ { "emoji": "💄", "name": "lipstick", "slug": "lipstick" },
+ { "emoji": "💍", "name": "ring", "slug": "ring" },
+ { "emoji": "💎", "name": "gem stone", "slug": "gem_stone" },
+ { "emoji": "🔇", "name": "muted speaker", "slug": "muted_speaker" },
{
"emoji": "🔈",
"name": "speaker low volume",
@@ -5784,266 +2792,74 @@
"name": "speaker high volume",
"slug": "speaker_high_volume"
},
- {
- "emoji": "📢",
- "name": "loudspeaker",
- "slug": "loudspeaker"
- },
- {
- "emoji": "📣",
- "name": "megaphone",
- "slug": "megaphone"
- },
- {
- "emoji": "📯",
- "name": "postal horn",
- "slug": "postal_horn"
- },
- {
- "emoji": "🔔",
- "name": "bell",
- "slug": "bell"
- },
- {
- "emoji": "🔕",
- "name": "bell with slash",
- "slug": "bell_with_slash"
- },
- {
- "emoji": "🎼",
- "name": "musical score",
- "slug": "musical_score"
- },
- {
- "emoji": "🎵",
- "name": "musical note",
- "slug": "musical_note"
- },
- {
- "emoji": "🎶",
- "name": "musical notes",
- "slug": "musical_notes"
- },
+ { "emoji": "📢", "name": "loudspeaker", "slug": "loudspeaker" },
+ { "emoji": "📣", "name": "megaphone", "slug": "megaphone" },
+ { "emoji": "📯", "name": "postal horn", "slug": "postal_horn" },
+ { "emoji": "🔔", "name": "bell", "slug": "bell" },
+ { "emoji": "🔕", "name": "bell with slash", "slug": "bell_with_slash" },
+ { "emoji": "🎼", "name": "musical score", "slug": "musical_score" },
+ { "emoji": "🎵", "name": "musical note", "slug": "musical_note" },
+ { "emoji": "🎶", "name": "musical notes", "slug": "musical_notes" },
{
"emoji": "🎙️",
"name": "studio microphone",
"slug": "studio_microphone"
},
- {
- "emoji": "🎚️",
- "name": "level slider",
- "slug": "level_slider"
- },
- {
- "emoji": "🎛️",
- "name": "control knobs",
- "slug": "control_knobs"
- },
- {
- "emoji": "🎤",
- "name": "microphone",
- "slug": "microphone"
- },
- {
- "emoji": "🎧",
- "name": "headphone",
- "slug": "headphone"
- },
- {
- "emoji": "📻",
- "name": "radio",
- "slug": "radio"
- },
- {
- "emoji": "🎷",
- "name": "saxophone",
- "slug": "saxophone"
- },
- {
- "emoji": "🪗",
- "name": "accordion",
- "slug": "accordion"
- },
- {
- "emoji": "🎸",
- "name": "guitar",
- "slug": "guitar"
- },
- {
- "emoji": "🎹",
- "name": "musical keyboard",
- "slug": "musical_keyboard"
- },
- {
- "emoji": "🎺",
- "name": "trumpet",
- "slug": "trumpet"
- },
- {
- "emoji": "🎻",
- "name": "violin",
- "slug": "violin"
- },
- {
- "emoji": "🪕",
- "name": "banjo",
- "slug": "banjo"
- },
- {
- "emoji": "🥁",
- "name": "drum",
- "slug": "drum"
- },
- {
- "emoji": "🪘",
- "name": "long drum",
- "slug": "long_drum"
- },
- {
- "emoji": "📱",
- "name": "mobile phone",
- "slug": "mobile_phone"
- },
+ { "emoji": "🎚️", "name": "level slider", "slug": "level_slider" },
+ { "emoji": "🎛️", "name": "control knobs", "slug": "control_knobs" },
+ { "emoji": "🎤", "name": "microphone", "slug": "microphone" },
+ { "emoji": "🎧", "name": "headphone", "slug": "headphone" },
+ { "emoji": "📻", "name": "radio", "slug": "radio" },
+ { "emoji": "🎷", "name": "saxophone", "slug": "saxophone" },
+ { "emoji": "🪗", "name": "accordion", "slug": "accordion" },
+ { "emoji": "🎸", "name": "guitar", "slug": "guitar" },
+ { "emoji": "🎹", "name": "musical keyboard", "slug": "musical_keyboard" },
+ { "emoji": "🎺", "name": "trumpet", "slug": "trumpet" },
+ { "emoji": "🎻", "name": "violin", "slug": "violin" },
+ { "emoji": "🪕", "name": "banjo", "slug": "banjo" },
+ { "emoji": "🥁", "name": "drum", "slug": "drum" },
+ { "emoji": "🪘", "name": "long drum", "slug": "long_drum" },
+ { "emoji": "📱", "name": "mobile phone", "slug": "mobile_phone" },
{
"emoji": "📲",
"name": "mobile phone with arrow",
"slug": "mobile_phone_with_arrow"
},
- {
- "emoji": "☎️",
- "name": "telephone",
- "slug": "telephone"
- },
+ { "emoji": "☎️", "name": "telephone", "slug": "telephone" },
{
"emoji": "📞",
"name": "telephone receiver",
"slug": "telephone_receiver"
},
- {
- "emoji": "📟",
- "name": "pager",
- "slug": "pager"
- },
- {
- "emoji": "📠",
- "name": "fax machine",
- "slug": "fax_machine"
- },
- {
- "emoji": "🔋",
- "name": "battery",
- "slug": "battery"
- },
- {
- "emoji": "🪫",
- "name": "low battery",
- "slug": "low_battery"
- },
- {
- "emoji": "🔌",
- "name": "electric plug",
- "slug": "electric_plug"
- },
- {
- "emoji": "💻",
- "name": "laptop",
- "slug": "laptop"
- },
- {
- "emoji": "🖥️",
- "name": "desktop computer",
- "slug": "desktop_computer"
- },
- {
- "emoji": "🖨️",
- "name": "printer",
- "slug": "printer"
- },
- {
- "emoji": "⌨️",
- "name": "keyboard",
- "slug": "keyboard"
- },
- {
- "emoji": "🖱️",
- "name": "computer mouse",
- "slug": "computer_mouse"
- },
- {
- "emoji": "🖲️",
- "name": "trackball",
- "slug": "trackball"
- },
- {
- "emoji": "💽",
- "name": "computer disk",
- "slug": "computer_disk"
- },
- {
- "emoji": "💾",
- "name": "floppy disk",
- "slug": "floppy_disk"
- },
- {
- "emoji": "💿",
- "name": "optical disk",
- "slug": "optical_disk"
- },
- {
- "emoji": "📀",
- "name": "dvd",
- "slug": "dvd"
- },
- {
- "emoji": "🧮",
- "name": "abacus",
- "slug": "abacus"
- },
- {
- "emoji": "🎥",
- "name": "movie camera",
- "slug": "movie_camera"
- },
- {
- "emoji": "🎞️",
- "name": "film frames",
- "slug": "film_frames"
- },
- {
- "emoji": "📽️",
- "name": "film projector",
- "slug": "film_projector"
- },
- {
- "emoji": "🎬",
- "name": "clapper board",
- "slug": "clapper_board"
- },
- {
- "emoji": "📺",
- "name": "television",
- "slug": "television"
- },
- {
- "emoji": "📷",
- "name": "camera",
- "slug": "camera"
- },
+ { "emoji": "📟", "name": "pager", "slug": "pager" },
+ { "emoji": "📠", "name": "fax machine", "slug": "fax_machine" },
+ { "emoji": "🔋", "name": "battery", "slug": "battery" },
+ { "emoji": "🪫", "name": "low battery", "slug": "low_battery" },
+ { "emoji": "🔌", "name": "electric plug", "slug": "electric_plug" },
+ { "emoji": "💻", "name": "laptop", "slug": "laptop" },
+ { "emoji": "🖥️", "name": "desktop computer", "slug": "desktop_computer" },
+ { "emoji": "🖨️", "name": "printer", "slug": "printer" },
+ { "emoji": "⌨️", "name": "keyboard", "slug": "keyboard" },
+ { "emoji": "🖱️", "name": "computer mouse", "slug": "computer_mouse" },
+ { "emoji": "🖲️", "name": "trackball", "slug": "trackball" },
+ { "emoji": "💽", "name": "computer disk", "slug": "computer_disk" },
+ { "emoji": "💾", "name": "floppy disk", "slug": "floppy_disk" },
+ { "emoji": "💿", "name": "optical disk", "slug": "optical_disk" },
+ { "emoji": "📀", "name": "dvd", "slug": "dvd" },
+ { "emoji": "🧮", "name": "abacus", "slug": "abacus" },
+ { "emoji": "🎥", "name": "movie camera", "slug": "movie_camera" },
+ { "emoji": "🎞️", "name": "film frames", "slug": "film_frames" },
+ { "emoji": "📽️", "name": "film projector", "slug": "film_projector" },
+ { "emoji": "🎬", "name": "clapper board", "slug": "clapper_board" },
+ { "emoji": "📺", "name": "television", "slug": "television" },
+ { "emoji": "📷", "name": "camera", "slug": "camera" },
{
"emoji": "📸",
"name": "camera with flash",
"slug": "camera_with_flash"
},
- {
- "emoji": "📹",
- "name": "video camera",
- "slug": "video_camera"
- },
- {
- "emoji": "📼",
- "name": "videocassette",
- "slug": "videocassette"
- },
+ { "emoji": "📹", "name": "video camera", "slug": "video_camera" },
+ { "emoji": "📼", "name": "videocassette", "slug": "videocassette" },
{
"emoji": "🔍",
"name": "magnifying glass tilted left",
@@ -6054,176 +2870,56 @@
"name": "magnifying glass tilted right",
"slug": "magnifying_glass_tilted_right"
},
- {
- "emoji": "🕯️",
- "name": "candle",
- "slug": "candle"
- },
- {
- "emoji": "💡",
- "name": "light bulb",
- "slug": "light_bulb"
- },
- {
- "emoji": "🔦",
- "name": "flashlight",
- "slug": "flashlight"
- },
+ { "emoji": "🕯️", "name": "candle", "slug": "candle" },
+ { "emoji": "💡", "name": "light bulb", "slug": "light_bulb" },
+ { "emoji": "🔦", "name": "flashlight", "slug": "flashlight" },
{
"emoji": "🏮",
"name": "red paper lantern",
"slug": "red_paper_lantern"
},
- {
- "emoji": "🪔",
- "name": "diya lamp",
- "slug": "diya_lamp"
- },
+ { "emoji": "🪔", "name": "diya lamp", "slug": "diya_lamp" },
{
"emoji": "📔",
"name": "notebook with decorative cover",
"slug": "notebook_with_decorative_cover"
},
- {
- "emoji": "📕",
- "name": "closed book",
- "slug": "closed_book"
- },
- {
- "emoji": "📖",
- "name": "open book",
- "slug": "open_book"
- },
- {
- "emoji": "📗",
- "name": "green book",
- "slug": "green_book"
- },
- {
- "emoji": "📘",
- "name": "blue book",
- "slug": "blue_book"
- },
- {
- "emoji": "📙",
- "name": "orange book",
- "slug": "orange_book"
- },
- {
- "emoji": "📚",
- "name": "books",
- "slug": "books"
- },
- {
- "emoji": "📓",
- "name": "notebook",
- "slug": "notebook"
- },
- {
- "emoji": "📒",
- "name": "ledger",
- "slug": "ledger"
- },
- {
- "emoji": "📃",
- "name": "page with curl",
- "slug": "page_with_curl"
- },
- {
- "emoji": "📜",
- "name": "scroll",
- "slug": "scroll"
- },
- {
- "emoji": "📄",
- "name": "page facing up",
- "slug": "page_facing_up"
- },
- {
- "emoji": "📰",
- "name": "newspaper",
- "slug": "newspaper"
- },
+ { "emoji": "📕", "name": "closed book", "slug": "closed_book" },
+ { "emoji": "📖", "name": "open book", "slug": "open_book" },
+ { "emoji": "📗", "name": "green book", "slug": "green_book" },
+ { "emoji": "📘", "name": "blue book", "slug": "blue_book" },
+ { "emoji": "📙", "name": "orange book", "slug": "orange_book" },
+ { "emoji": "📚", "name": "books", "slug": "books" },
+ { "emoji": "📓", "name": "notebook", "slug": "notebook" },
+ { "emoji": "📒", "name": "ledger", "slug": "ledger" },
+ { "emoji": "📃", "name": "page with curl", "slug": "page_with_curl" },
+ { "emoji": "📜", "name": "scroll", "slug": "scroll" },
+ { "emoji": "📄", "name": "page facing up", "slug": "page_facing_up" },
+ { "emoji": "📰", "name": "newspaper", "slug": "newspaper" },
{
"emoji": "🗞️",
"name": "rolled-up newspaper",
"slug": "rolled_up_newspaper"
},
- {
- "emoji": "📑",
- "name": "bookmark tabs",
- "slug": "bookmark_tabs"
- },
- {
- "emoji": "🔖",
- "name": "bookmark",
- "slug": "bookmark"
- },
- {
- "emoji": "🏷️",
- "name": "label",
- "slug": "label"
- },
- {
- "emoji": "💰",
- "name": "money bag",
- "slug": "money_bag"
- },
- {
- "emoji": "🪙",
- "name": "coin",
- "slug": "coin"
- },
- {
- "emoji": "💴",
- "name": "yen banknote",
- "slug": "yen_banknote"
- },
- {
- "emoji": "💵",
- "name": "dollar banknote",
- "slug": "dollar_banknote"
- },
- {
- "emoji": "💶",
- "name": "euro banknote",
- "slug": "euro_banknote"
- },
- {
- "emoji": "💷",
- "name": "pound banknote",
- "slug": "pound_banknote"
- },
- {
- "emoji": "💸",
- "name": "money with wings",
- "slug": "money_with_wings"
- },
- {
- "emoji": "💳",
- "name": "credit card",
- "slug": "credit_card"
- },
- {
- "emoji": "🧾",
- "name": "receipt",
- "slug": "receipt"
- },
+ { "emoji": "📑", "name": "bookmark tabs", "slug": "bookmark_tabs" },
+ { "emoji": "🔖", "name": "bookmark", "slug": "bookmark" },
+ { "emoji": "🏷️", "name": "label", "slug": "label" },
+ { "emoji": "💰", "name": "money bag", "slug": "money_bag" },
+ { "emoji": "🪙", "name": "coin", "slug": "coin" },
+ { "emoji": "💴", "name": "yen banknote", "slug": "yen_banknote" },
+ { "emoji": "💵", "name": "dollar banknote", "slug": "dollar_banknote" },
+ { "emoji": "💶", "name": "euro banknote", "slug": "euro_banknote" },
+ { "emoji": "💷", "name": "pound banknote", "slug": "pound_banknote" },
+ { "emoji": "💸", "name": "money with wings", "slug": "money_with_wings" },
+ { "emoji": "💳", "name": "credit card", "slug": "credit_card" },
+ { "emoji": "🧾", "name": "receipt", "slug": "receipt" },
{
"emoji": "💹",
"name": "chart increasing with yen",
"slug": "chart_increasing_with_yen"
},
- {
- "emoji": "✉️",
- "name": "envelope",
- "slug": "envelope_email_letter"
- },
- {
- "emoji": "📧",
- "name": "e-mail",
- "slug": "e_mail_email"
- },
+ { "emoji": "✉️", "name": "envelope", "slug": "envelope_email_letter" },
+ { "emoji": "📧", "name": "e-mail", "slug": "e_mail_email" },
{
"emoji": "📨",
"name": "incoming envelope",
@@ -6234,21 +2930,9 @@
"name": "envelope with arrow",
"slug": "envelope_with_arrow_email_letter"
},
- {
- "emoji": "📤",
- "name": "outbox tray",
- "slug": "outbox_tray_sent"
- },
- {
- "emoji": "📥",
- "name": "inbox tray",
- "slug": "inbox_tray_receive"
- },
- {
- "emoji": "📦",
- "name": "package",
- "slug": "package_parcel_box"
- },
+ { "emoji": "📤", "name": "outbox tray", "slug": "outbox_tray_sent" },
+ { "emoji": "📥", "name": "inbox tray", "slug": "inbox_tray_receive" },
+ { "emoji": "📦", "name": "package", "slug": "package_parcel_box" },
{
"emoji": "📫",
"name": "closed mailbox with raised flag",
@@ -6269,211 +2953,63 @@
"name": "open mailbox with lowered flag",
"slug": "open_mailbox_with_lowered_flag"
},
- {
- "emoji": "📮",
- "name": "postbox",
- "slug": "postbox"
- },
+ { "emoji": "📮", "name": "postbox", "slug": "postbox" },
{
"emoji": "🗳️",
"name": "ballot box with ballot",
"slug": "ballot_box_with_ballot"
},
- {
- "emoji": "✏️",
- "name": "pencil",
- "slug": "pencil"
- },
- {
- "emoji": "✒️",
- "name": "black nib",
- "slug": "black_nib"
- },
- {
- "emoji": "🖋️",
- "name": "fountain pen",
- "slug": "fountain_pen"
- },
- {
- "emoji": "🖊️",
- "name": "pen",
- "slug": "pen"
- },
- {
- "emoji": "🖌️",
- "name": "paintbrush",
- "slug": "paintbrush"
- },
- {
- "emoji": "🖍️",
- "name": "crayon",
- "slug": "crayon"
- },
- {
- "emoji": "📝",
- "name": "memo",
- "slug": "memo"
- },
- {
- "emoji": "💼",
- "name": "briefcase",
- "slug": "briefcase"
- },
- {
- "emoji": "📁",
- "name": "file folder",
- "slug": "file_folder"
- },
- {
- "emoji": "📂",
- "name": "open file folder",
- "slug": "open_file_folder"
- },
+ { "emoji": "✏️", "name": "pencil", "slug": "pencil" },
+ { "emoji": "✒️", "name": "black nib", "slug": "black_nib" },
+ { "emoji": "🖋️", "name": "fountain pen", "slug": "fountain_pen" },
+ { "emoji": "🖊️", "name": "pen", "slug": "pen" },
+ { "emoji": "🖌️", "name": "paintbrush", "slug": "paintbrush" },
+ { "emoji": "🖍️", "name": "crayon", "slug": "crayon" },
+ { "emoji": "📝", "name": "memo", "slug": "memo" },
+ { "emoji": "💼", "name": "briefcase", "slug": "briefcase" },
+ { "emoji": "📁", "name": "file folder", "slug": "file_folder" },
+ { "emoji": "📂", "name": "open file folder", "slug": "open_file_folder" },
{
"emoji": "🗂️",
"name": "card index dividers",
"slug": "card_index_dividers"
},
- {
- "emoji": "📅",
- "name": "calendar",
- "slug": "calendar"
- },
+ { "emoji": "📅", "name": "calendar", "slug": "calendar" },
{
"emoji": "📆",
"name": "tear-off calendar",
"slug": "tear_off_calendar"
},
- {
- "emoji": "🗒️",
- "name": "spiral notepad",
- "slug": "spiral_notepad"
- },
- {
- "emoji": "🗓️",
- "name": "spiral calendar",
- "slug": "spiral_calendar"
- },
- {
- "emoji": "📇",
- "name": "card index",
- "slug": "card_index"
- },
- {
- "emoji": "📈",
- "name": "chart increasing",
- "slug": "chart_increasing"
- },
- {
- "emoji": "📉",
- "name": "chart decreasing",
- "slug": "chart_decreasing"
- },
- {
- "emoji": "📊",
- "name": "bar chart",
- "slug": "bar_chart"
- },
- {
- "emoji": "📋",
- "name": "clipboard",
- "slug": "clipboard"
- },
- {
- "emoji": "📌",
- "name": "pushpin",
- "slug": "pushpin"
- },
- {
- "emoji": "📍",
- "name": "round pushpin",
- "slug": "round_pushpin"
- },
- {
- "emoji": "📎",
- "name": "paperclip",
- "slug": "paperclip"
- },
+ { "emoji": "🗒️", "name": "spiral notepad", "slug": "spiral_notepad" },
+ { "emoji": "🗓️", "name": "spiral calendar", "slug": "spiral_calendar" },
+ { "emoji": "📇", "name": "card index", "slug": "card_index" },
+ { "emoji": "📈", "name": "chart increasing", "slug": "chart_increasing" },
+ { "emoji": "📉", "name": "chart decreasing", "slug": "chart_decreasing" },
+ { "emoji": "📊", "name": "bar chart", "slug": "bar_chart" },
+ { "emoji": "📋", "name": "clipboard", "slug": "clipboard" },
+ { "emoji": "📌", "name": "pushpin", "slug": "pushpin" },
+ { "emoji": "📍", "name": "round pushpin", "slug": "round_pushpin" },
+ { "emoji": "📎", "name": "paperclip", "slug": "paperclip" },
{
"emoji": "🖇️",
"name": "linked paperclips",
"slug": "linked_paperclips"
},
- {
- "emoji": "📏",
- "name": "straight ruler",
- "slug": "straight_ruler"
- },
- {
- "emoji": "📐",
- "name": "triangular ruler",
- "slug": "triangular_ruler"
- },
- {
- "emoji": "✂️",
- "name": "scissors",
- "slug": "scissors"
- },
- {
- "emoji": "🗃️",
- "name": "card file box",
- "slug": "card_file_box"
- },
- {
- "emoji": "🗄️",
- "name": "file cabinet",
- "slug": "file_cabinet"
- },
- {
- "emoji": "🗑️",
- "name": "wastebasket",
- "slug": "wastebasket"
- },
- {
- "emoji": "🔒",
- "name": "locked",
- "slug": "locked"
- },
- {
- "emoji": "🔓",
- "name": "unlocked",
- "slug": "unlocked"
- },
- {
- "emoji": "🔏",
- "name": "locked with pen",
- "slug": "locked_with_pen"
- },
- {
- "emoji": "🔐",
- "name": "locked with key",
- "slug": "locked_with_key"
- },
- {
- "emoji": "🔑",
- "name": "key",
- "slug": "key"
- },
- {
- "emoji": "🗝️",
- "name": "old key",
- "slug": "old_key"
- },
- {
- "emoji": "🔨",
- "name": "hammer",
- "slug": "hammer_tool"
- },
- {
- "emoji": "🪓",
- "name": "axe",
- "slug": "axe"
- },
- {
- "emoji": "⛏️",
- "name": "pick",
- "slug": "pick_tool"
- },
+ { "emoji": "📏", "name": "straight ruler", "slug": "straight_ruler" },
+ { "emoji": "📐", "name": "triangular ruler", "slug": "triangular_ruler" },
+ { "emoji": "✂️", "name": "scissors", "slug": "scissors" },
+ { "emoji": "🗃️", "name": "card file box", "slug": "card_file_box" },
+ { "emoji": "🗄️", "name": "file cabinet", "slug": "file_cabinet" },
+ { "emoji": "🗑️", "name": "wastebasket", "slug": "wastebasket" },
+ { "emoji": "🔒", "name": "locked", "slug": "locked" },
+ { "emoji": "🔓", "name": "unlocked", "slug": "unlocked" },
+ { "emoji": "🔏", "name": "locked with pen", "slug": "locked_with_pen" },
+ { "emoji": "🔐", "name": "locked with key", "slug": "locked_with_key" },
+ { "emoji": "🔑", "name": "key", "slug": "key" },
+ { "emoji": "🗝️", "name": "old key", "slug": "old_key" },
+ { "emoji": "🔨", "name": "hammer", "slug": "hammer_tool" },
+ { "emoji": "🪓", "name": "axe", "slug": "axe" },
+ { "emoji": "⛏️", "name": "pick", "slug": "pick_tool" },
{
"emoji": "⚒️",
"name": "hammer and pick",
@@ -6484,341 +3020,89 @@
"name": "hammer and wrench",
"slug": "hammer_and_wrench_tool"
},
- {
- "emoji": "🗡️",
- "name": "dagger",
- "slug": "dagger_knife_weapon"
- },
+ { "emoji": "🗡️", "name": "dagger", "slug": "dagger_knife_weapon" },
{
"emoji": "⚔️",
"name": "crossed swords",
"slug": "crossed_swords_weapon"
},
- {
- "emoji": "💣",
- "name": "bomb",
- "slug": "bomb_comic"
- },
- {
- "emoji": "🪃",
- "name": "boomerang",
- "slug": "boomerang"
- },
- {
- "emoji": "🏹",
- "name": "bow and arrow",
- "slug": "bow_and_arrow"
- },
- {
- "emoji": "🛡️",
- "name": "shield",
- "slug": "shield"
- },
- {
- "emoji": "🪚",
- "name": "carpentry saw",
- "slug": "carpentry_saw"
- },
- {
- "emoji": "🔧",
- "name": "wrench",
- "slug": "wrench_tool"
- },
- {
- "emoji": "🪛",
- "name": "screwdriver",
- "slug": "screwdriver_tool"
- },
- {
- "emoji": "🔩",
- "name": "nut and bolt",
- "slug": "nut_and_bolt_tool"
- },
- {
- "emoji": "⚙️",
- "name": "gear",
- "slug": "gear_tool"
- },
- {
- "emoji": "🗜️",
- "name": "clamp",
- "slug": "clamp_tool"
- },
+ { "emoji": "💣", "name": "bomb", "slug": "bomb_comic" },
+ { "emoji": "🪃", "name": "boomerang", "slug": "boomerang" },
+ { "emoji": "🏹", "name": "bow and arrow", "slug": "bow_and_arrow" },
+ { "emoji": "🛡️", "name": "shield", "slug": "shield" },
+ { "emoji": "🪚", "name": "carpentry saw", "slug": "carpentry_saw" },
+ { "emoji": "🔧", "name": "wrench", "slug": "wrench_tool" },
+ { "emoji": "🪛", "name": "screwdriver", "slug": "screwdriver_tool" },
+ { "emoji": "🔩", "name": "nut and bolt", "slug": "nut_and_bolt_tool" },
+ { "emoji": "⚙️", "name": "gear", "slug": "gear_tool" },
+ { "emoji": "🗜️", "name": "clamp", "slug": "clamp_tool" },
{
"emoji": "⚖️",
"name": "balance scale",
"slug": "balance_scale_justice"
},
- {
- "emoji": "🦯",
- "name": "white cane",
- "slug": "white_cane"
- },
- {
- "emoji": "🔗",
- "name": "link",
- "slug": "link"
- },
- {
- "emoji": "⛓️",
- "name": "chains",
- "slug": "chains"
- },
- {
- "emoji": "🪝",
- "name": "hook",
- "slug": "hook"
- },
- {
- "emoji": "🧰",
- "name": "toolbox",
- "slug": "toolbox"
- },
- {
- "emoji": "🧲",
- "name": "magnet",
- "slug": "magnet"
- },
- {
- "emoji": "🪜",
- "name": "ladder",
- "slug": "ladder"
- },
- {
- "emoji": "⚗️",
- "name": "alembic",
- "slug": "alembic"
- },
- {
- "emoji": "🧪",
- "name": "test tube",
- "slug": "test_tube"
- },
- {
- "emoji": "🧫",
- "name": "petri dish",
- "slug": "petri_dish"
- },
- {
- "emoji": "🧬",
- "name": "dna",
- "slug": "dna"
- },
- {
- "emoji": "🔬",
- "name": "microscope",
- "slug": "microscope"
- },
- {
- "emoji": "🔭",
- "name": "telescope",
- "slug": "telescope"
- },
+ { "emoji": "🦯", "name": "white cane", "slug": "white_cane" },
+ { "emoji": "🔗", "name": "link", "slug": "link" },
+ { "emoji": "⛓️", "name": "chains", "slug": "chains" },
+ { "emoji": "🪝", "name": "hook", "slug": "hook" },
+ { "emoji": "🧰", "name": "toolbox", "slug": "toolbox" },
+ { "emoji": "🧲", "name": "magnet", "slug": "magnet" },
+ { "emoji": "🪜", "name": "ladder", "slug": "ladder" },
+ { "emoji": "⚗️", "name": "alembic", "slug": "alembic" },
+ { "emoji": "🧪", "name": "test tube", "slug": "test_tube" },
+ { "emoji": "🧫", "name": "petri dish", "slug": "petri_dish" },
+ { "emoji": "🧬", "name": "dna", "slug": "dna" },
+ { "emoji": "🔬", "name": "microscope", "slug": "microscope" },
+ { "emoji": "🔭", "name": "telescope", "slug": "telescope" },
{
"emoji": "📡",
"name": "satellite antenna",
"slug": "satellite_antenna"
},
- {
- "emoji": "💉",
- "name": "syringe",
- "slug": "syringe"
- },
- {
- "emoji": "🩸",
- "name": "drop of blood",
- "slug": "drop_of_blood"
- },
- {
- "emoji": "💊",
- "name": "pill",
- "slug": "pill_medical_medicine_sick"
- },
- {
- "emoji": "🩹",
- "name": "adhesive bandage",
- "slug": "adhesive_bandage"
- },
- {
- "emoji": "🩼",
- "name": "crutch",
- "slug": "crutch"
- },
- {
- "emoji": "🩺",
- "name": "stethoscope",
- "slug": "stethoscope"
- },
- {
- "emoji": "🩻",
- "name": "x-ray",
- "slug": "x_ray"
- },
- {
- "emoji": "🚪",
- "name": "door",
- "slug": "door"
- },
- {
- "emoji": "🛗",
- "name": "elevator",
- "slug": "elevator"
- },
- {
- "emoji": "🪞",
- "name": "mirror",
- "slug": "mirror"
- },
- {
- "emoji": "🪟",
- "name": "window",
- "slug": "window"
- },
- {
- "emoji": "🛏️",
- "name": "bed",
- "slug": "bed"
- },
- {
- "emoji": "🛋️",
- "name": "couch and lamp",
- "slug": "couch_and_lamp"
- },
- {
- "emoji": "🪑",
- "name": "chair",
- "slug": "chair"
- },
- {
- "emoji": "🚽",
- "name": "toilet",
- "slug": "toilet"
- },
- {
- "emoji": "🪠",
- "name": "plunger",
- "slug": "plunger"
- },
- {
- "emoji": "🚿",
- "name": "shower",
- "slug": "shower"
- },
- {
- "emoji": "🛁",
- "name": "bathtub",
- "slug": "bathtub"
- },
- {
- "emoji": "🪤",
- "name": "mouse trap",
- "slug": "mouse_trap"
- },
- {
- "emoji": "🪒",
- "name": "razor",
- "slug": "razor"
- },
- {
- "emoji": "🧴",
- "name": "lotion bottle",
- "slug": "lotion_bottle"
- },
- {
- "emoji": "🧷",
- "name": "safety pin",
- "slug": "safety_pin"
- },
- {
- "emoji": "🧹",
- "name": "broom",
- "slug": "broom"
- },
- {
- "emoji": "🧺",
- "name": "basket",
- "slug": "basket"
- },
- {
- "emoji": "🧻",
- "name": "roll of paper",
- "slug": "roll_of_paper"
- },
- {
- "emoji": "🪣",
- "name": "bucket",
- "slug": "bucket"
- },
- {
- "emoji": "🧼",
- "name": "soap",
- "slug": "soap"
- },
- {
- "emoji": "🫧",
- "name": "bubbles",
- "slug": "bubbles"
- },
- {
- "emoji": "🪥",
- "name": "toothbrush",
- "slug": "toothbrush"
- },
- {
- "emoji": "🧽",
- "name": "sponge",
- "slug": "sponge"
- },
+ { "emoji": "💉", "name": "syringe", "slug": "syringe" },
+ { "emoji": "🩸", "name": "drop of blood", "slug": "drop_of_blood" },
+ { "emoji": "💊", "name": "pill", "slug": "pill_medical_medicine_sick" },
+ { "emoji": "🩹", "name": "adhesive bandage", "slug": "adhesive_bandage" },
+ { "emoji": "🩼", "name": "crutch", "slug": "crutch" },
+ { "emoji": "🩺", "name": "stethoscope", "slug": "stethoscope" },
+ { "emoji": "🩻", "name": "x-ray", "slug": "x_ray" },
+ { "emoji": "🚪", "name": "door", "slug": "door" },
+ { "emoji": "🛗", "name": "elevator", "slug": "elevator" },
+ { "emoji": "🪞", "name": "mirror", "slug": "mirror" },
+ { "emoji": "🪟", "name": "window", "slug": "window" },
+ { "emoji": "🛏️", "name": "bed", "slug": "bed" },
+ { "emoji": "🛋️", "name": "couch and lamp", "slug": "couch_and_lamp" },
+ { "emoji": "🪑", "name": "chair", "slug": "chair" },
+ { "emoji": "🚽", "name": "toilet", "slug": "toilet" },
+ { "emoji": "🪠", "name": "plunger", "slug": "plunger" },
+ { "emoji": "🚿", "name": "shower", "slug": "shower" },
+ { "emoji": "🛁", "name": "bathtub", "slug": "bathtub" },
+ { "emoji": "🪤", "name": "mouse trap", "slug": "mouse_trap" },
+ { "emoji": "🪒", "name": "razor", "slug": "razor" },
+ { "emoji": "🧴", "name": "lotion bottle", "slug": "lotion_bottle" },
+ { "emoji": "🧷", "name": "safety pin", "slug": "safety_pin" },
+ { "emoji": "🧹", "name": "broom", "slug": "broom" },
+ { "emoji": "🧺", "name": "basket", "slug": "basket" },
+ { "emoji": "🧻", "name": "roll of paper", "slug": "roll_of_paper" },
+ { "emoji": "🪣", "name": "bucket", "slug": "bucket" },
+ { "emoji": "🧼", "name": "soap", "slug": "soap" },
+ { "emoji": "🫧", "name": "bubbles", "slug": "bubbles" },
+ { "emoji": "🪥", "name": "toothbrush", "slug": "toothbrush" },
+ { "emoji": "🧽", "name": "sponge", "slug": "sponge" },
{
"emoji": "🧯",
"name": "fire extinguisher",
"slug": "fire_extinguisher"
},
- {
- "emoji": "🛒",
- "name": "shopping cart",
- "slug": "shopping_cart"
- },
- {
- "emoji": "🚬",
- "name": "cigarette",
- "slug": "cigarette"
- },
- {
- "emoji": "⚰️",
- "name": "coffin",
- "slug": "coffin"
- },
- {
- "emoji": "🪦",
- "name": "headstone",
- "slug": "headstone"
- },
- {
- "emoji": "⚱️",
- "name": "funeral urn",
- "slug": "funeral_urn"
- },
- {
- "emoji": "🧿",
- "name": "nazar amulet",
- "slug": "nazar_amulet"
- },
- {
- "emoji": "🪬",
- "name": "hamsa",
- "slug": "hamsa"
- },
- {
- "emoji": "🗿",
- "name": "moai",
- "slug": "moai"
- },
- {
- "emoji": "🪧",
- "name": "placard",
- "slug": "placard"
- },
+ { "emoji": "🛒", "name": "shopping cart", "slug": "shopping_cart" },
+ { "emoji": "🚬", "name": "cigarette", "slug": "cigarette" },
+ { "emoji": "⚰️", "name": "coffin", "slug": "coffin" },
+ { "emoji": "🪦", "name": "headstone", "slug": "headstone" },
+ { "emoji": "⚱️", "name": "funeral urn", "slug": "funeral_urn" },
+ { "emoji": "🧿", "name": "nazar amulet", "slug": "nazar_amulet" },
+ { "emoji": "🪬", "name": "hamsa", "slug": "hamsa" },
+ { "emoji": "🗿", "name": "moai", "slug": "moai" },
+ { "emoji": "🪧", "name": "placard", "slug": "placard" },
{
"emoji": "🪪",
"name": "identification card",
@@ -6840,176 +3124,60 @@
"name": "litter in bin sign",
"slug": "litter_in_bin_sign"
},
+ { "emoji": "🚰", "name": "potable water", "slug": "potable_water" },
{
- "emoji": "🚰",
- "name": "potable water",
- "slug": "potable_water"
- },
- {
- "emoji": "♿",
+ "emoji": "♿️",
"name": "wheelchair symbol",
"slug": "wheelchair_symbol"
},
- {
- "emoji": "🚹",
- "name": "men’s room",
- "slug": "men_s_room_bathroom"
- },
+ { "emoji": "🚹", "name": "men’s room", "slug": "men_s_room_bathroom" },
{
"emoji": "🚺",
"name": "women’s room",
"slug": "women_s_room_bathroom"
},
- {
- "emoji": "🚻",
- "name": "restroom",
- "slug": "restroom"
- },
- {
- "emoji": "🚼",
- "name": "baby symbol",
- "slug": "baby_symbol"
- },
- {
- "emoji": "🚾",
- "name": "water closet",
- "slug": "water_closet"
- },
- {
- "emoji": "🛂",
- "name": "passport control",
- "slug": "passport_control"
- },
- {
- "emoji": "🛃",
- "name": "customs",
- "slug": "customs"
- },
- {
- "emoji": "🛄",
- "name": "baggage claim",
- "slug": "baggage_claim"
- },
- {
- "emoji": "🛅",
- "name": "left luggage",
- "slug": "left_luggage"
- },
- {
- "emoji": "⚠️",
- "name": "warning",
- "slug": "warning"
- },
+ { "emoji": "🚻", "name": "restroom", "slug": "restroom" },
+ { "emoji": "🚼", "name": "baby symbol", "slug": "baby_symbol" },
+ { "emoji": "🚾", "name": "water closet", "slug": "water_closet" },
+ { "emoji": "🛂", "name": "passport control", "slug": "passport_control" },
+ { "emoji": "🛃", "name": "customs", "slug": "customs" },
+ { "emoji": "🛄", "name": "baggage claim", "slug": "baggage_claim" },
+ { "emoji": "🛅", "name": "left luggage", "slug": "left_luggage" },
+ { "emoji": "⚠️", "name": "warning", "slug": "warning" },
{
"emoji": "🚸",
"name": "children crossing",
"slug": "children_crossing"
},
- {
- "emoji": "⛔",
- "name": "no entry",
- "slug": "no_entry"
- },
- {
- "emoji": "🚫",
- "name": "prohibited",
- "slug": "prohibited"
- },
- {
- "emoji": "🚳",
- "name": "no bicycles",
- "slug": "no_bicycles"
- },
- {
- "emoji": "🚭",
- "name": "no smoking",
- "slug": "no_smoking"
- },
- {
- "emoji": "🚯",
- "name": "no littering",
- "slug": "no_littering"
- },
+ { "emoji": "⛔️", "name": "no entry", "slug": "no_entry" },
+ { "emoji": "🚫", "name": "prohibited", "slug": "prohibited" },
+ { "emoji": "🚳", "name": "no bicycles", "slug": "no_bicycles" },
+ { "emoji": "🚭", "name": "no smoking", "slug": "no_smoking" },
+ { "emoji": "🚯", "name": "no littering", "slug": "no_littering" },
{
"emoji": "🚱",
"name": "non-potable water",
"slug": "non_potable_water"
},
- {
- "emoji": "🚷",
- "name": "no pedestrians",
- "slug": "no_pedestrians"
- },
- {
- "emoji": "📵",
- "name": "no mobile phones",
- "slug": "no_mobile_phones"
- },
+ { "emoji": "🚷", "name": "no pedestrians", "slug": "no_pedestrians" },
+ { "emoji": "📵", "name": "no mobile phones", "slug": "no_mobile_phones" },
{
"emoji": "🔞",
"name": "no one under eighteen",
"slug": "no_one_under_eighteen_18_age_limit_prohibited"
},
- {
- "emoji": "☢️",
- "name": "radioactive",
- "slug": "radioactive"
- },
- {
- "emoji": "☣️",
- "name": "biohazard",
- "slug": "biohazard"
- },
- {
- "emoji": "⬆️",
- "name": "up arrow",
- "slug": "up_arrow"
- },
- {
- "emoji": "↗️",
- "name": "up-right arrow",
- "slug": "up_right_arrow"
- },
- {
- "emoji": "➡️",
- "name": "right arrow",
- "slug": "right_arrow"
- },
- {
- "emoji": "↘️",
- "name": "down-right arrow",
- "slug": "down_right_arrow"
- },
- {
- "emoji": "⬇️",
- "name": "down arrow",
- "slug": "down_arrow"
- },
- {
- "emoji": "↙️",
- "name": "down-left arrow",
- "slug": "down_left_arrow"
- },
- {
- "emoji": "⬅️",
- "name": "left arrow",
- "slug": "left_arrow"
- },
- {
- "emoji": "↖️",
- "name": "up-left arrow",
- "slug": "up_left_arrow"
- },
- {
- "emoji": "↕️",
- "name": "up-down arrow",
- "slug": "up_down_arrow"
- },
- {
- "emoji": "↔️",
- "name": "left-right arrow",
- "slug": "left_right_arrow"
- },
+ { "emoji": "☢️", "name": "radioactive", "slug": "radioactive" },
+ { "emoji": "☣️", "name": "biohazard", "slug": "biohazard" },
+ { "emoji": "⬆️", "name": "up arrow", "slug": "up_arrow" },
+ { "emoji": "↗️", "name": "up-right arrow", "slug": "up_right_arrow" },
+ { "emoji": "➡️", "name": "right arrow", "slug": "right_arrow" },
+ { "emoji": "↘️", "name": "down-right arrow", "slug": "down_right_arrow" },
+ { "emoji": "⬇️", "name": "down arrow", "slug": "down_arrow" },
+ { "emoji": "↙️", "name": "down-left arrow", "slug": "down_left_arrow" },
+ { "emoji": "⬅️", "name": "left arrow", "slug": "left_arrow" },
+ { "emoji": "↖️", "name": "up-left arrow", "slug": "up_left_arrow" },
+ { "emoji": "↕️", "name": "up-down arrow", "slug": "up_down_arrow" },
+ { "emoji": "↔️", "name": "left-right arrow", "slug": "left_right_arrow" },
{
"emoji": "↩️",
"name": "right arrow curving left",
@@ -7040,178 +3208,58 @@
"name": "counterclockwise arrows button",
"slug": "counterclockwise_arrows_button"
},
- {
- "emoji": "🔙",
- "name": "BACK arrow",
- "slug": "back_arrow"
- },
- {
- "emoji": "🔚",
- "name": "END arrow",
- "slug": "end_arrow"
- },
- {
- "emoji": "🔛",
- "name": "ON! arrow",
- "slug": "on_arrow"
- },
- {
- "emoji": "🔜",
- "name": "SOON arrow",
- "slug": "soon_arrow"
- },
- {
- "emoji": "🔝",
- "name": "TOP arrow",
- "slug": "top_arrow"
- },
- {
- "emoji": "🛐",
- "name": "place of worship",
- "slug": "place_of_worship"
- },
- {
- "emoji": "⚛️",
- "name": "atom symbol",
- "slug": "atom_symbol"
- },
- {
- "emoji": "🕉️",
- "name": "om",
- "slug": "om"
- },
- {
- "emoji": "✡️",
- "name": "star of David",
- "slug": "star_of_david"
- },
- {
- "emoji": "☸️",
- "name": "wheel of dharma",
- "slug": "wheel_of_dharma"
- },
- {
- "emoji": "☯️",
- "name": "yin yang",
- "slug": "yin_yang"
- },
- {
- "emoji": "✝️",
- "name": "latin cross",
- "slug": "latin_cross"
- },
- {
- "emoji": "☦️",
- "name": "orthodox cross",
- "slug": "orthodox_cross"
- },
+ { "emoji": "🔙", "name": "BACK arrow", "slug": "back_arrow" },
+ { "emoji": "🔚", "name": "END arrow", "slug": "end_arrow" },
+ { "emoji": "🔛", "name": "ON! arrow", "slug": "on_arrow" },
+ { "emoji": "🔜", "name": "SOON arrow", "slug": "soon_arrow" },
+ { "emoji": "🔝", "name": "TOP arrow", "slug": "top_arrow" },
+ { "emoji": "🛐", "name": "place of worship", "slug": "place_of_worship" },
+ { "emoji": "⚛️", "name": "atom symbol", "slug": "atom_symbol" },
+ { "emoji": "🕉️", "name": "om", "slug": "om" },
+ { "emoji": "✡️", "name": "star of David", "slug": "star_of_david" },
+ { "emoji": "☸️", "name": "wheel of dharma", "slug": "wheel_of_dharma" },
+ { "emoji": "☯️", "name": "yin yang", "slug": "yin_yang" },
+ { "emoji": "✝️", "name": "latin cross", "slug": "latin_cross" },
+ { "emoji": "☦️", "name": "orthodox cross", "slug": "orthodox_cross" },
{
"emoji": "☪️",
"name": "star and crescent",
"slug": "star_and_crescent"
},
- {
- "emoji": "☮️",
- "name": "peace symbol",
- "slug": "peace_symbol"
- },
- {
- "emoji": "🕎",
- "name": "menorah",
- "slug": "menorah"
- },
+ { "emoji": "☮️", "name": "peace symbol", "slug": "peace_symbol" },
+ { "emoji": "🕎", "name": "menorah", "slug": "menorah" },
{
"emoji": "🔯",
"name": "dotted six-pointed star",
"slug": "dotted_six_pointed_star"
},
- {
- "emoji": "♈",
- "name": "Aries",
- "slug": "aries"
- },
- {
- "emoji": "♉",
- "name": "Taurus",
- "slug": "taurus"
- },
- {
- "emoji": "♊",
- "name": "Gemini",
- "slug": "gemini"
- },
- {
- "emoji": "♋",
- "name": "Cancer",
- "slug": "cancer"
- },
- {
- "emoji": "♌",
- "name": "Leo",
- "slug": "leo"
- },
- {
- "emoji": "♍",
- "name": "Virgo",
- "slug": "virgo"
- },
- {
- "emoji": "♎",
- "name": "Libra",
- "slug": "libra"
- },
- {
- "emoji": "♏",
- "name": "Scorpio",
- "slug": "scorpio"
- },
- {
- "emoji": "♐",
- "name": "Sagittarius",
- "slug": "sagittarius"
- },
- {
- "emoji": "♑",
- "name": "Capricorn",
- "slug": "capricorn"
- },
- {
- "emoji": "♒",
- "name": "Aquarius",
- "slug": "aquarius"
- },
- {
- "emoji": "♓",
- "name": "Pisces",
- "slug": "pisces"
- },
- {
- "emoji": "⛎",
- "name": "Ophiuchus",
- "slug": "ophiuchus"
- },
+ { "emoji": "♈️", "name": "Aries", "slug": "aries" },
+ { "emoji": "♉️", "name": "Taurus", "slug": "taurus" },
+ { "emoji": "♊️", "name": "Gemini", "slug": "gemini" },
+ { "emoji": "♋️", "name": "Cancer", "slug": "cancer" },
+ { "emoji": "♌️", "name": "Leo", "slug": "leo" },
+ { "emoji": "♍️", "name": "Virgo", "slug": "virgo" },
+ { "emoji": "♎️", "name": "Libra", "slug": "libra" },
+ { "emoji": "♏️", "name": "Scorpio", "slug": "scorpio" },
+ { "emoji": "♐️", "name": "Sagittarius", "slug": "sagittarius" },
+ { "emoji": "♑️", "name": "Capricorn", "slug": "capricorn" },
+ { "emoji": "♒️", "name": "Aquarius", "slug": "aquarius" },
+ { "emoji": "♓️", "name": "Pisces", "slug": "pisces" },
+ { "emoji": "⛎️", "name": "Ophiuchus", "slug": "ophiuchus" },
{
"emoji": "🔀",
"name": "shuffle tracks button",
"slug": "shuffle_tracks_button"
},
- {
- "emoji": "🔁",
- "name": "repeat button",
- "slug": "repeat_button"
- },
+ { "emoji": "🔁", "name": "repeat button", "slug": "repeat_button" },
{
"emoji": "🔂",
"name": "repeat single button",
"slug": "repeat_single_button"
},
+ { "emoji": "▶️", "name": "play button", "slug": "play_button" },
{
- "emoji": "▶️",
- "name": "play button",
- "slug": "play_button"
- },
- {
- "emoji": "⏩",
+ "emoji": "⏩️",
"name": "fast-forward button",
"slug": "fast_forward_button"
},
@@ -7225,13 +3273,9 @@
"name": "play or pause button",
"slug": "play_or_pause_button"
},
+ { "emoji": "◀️", "name": "reverse button", "slug": "reverse_button" },
{
- "emoji": "◀️",
- "name": "reverse button",
- "slug": "reverse_button"
- },
- {
- "emoji": "⏪",
+ "emoji": "⏪️",
"name": "fast reverse button",
"slug": "fast_reverse_button"
},
@@ -7240,121 +3284,41 @@
"name": "last track button",
"slug": "last_track_button"
},
+ { "emoji": "🔼", "name": "upwards button", "slug": "upwards_button" },
+ { "emoji": "⏫️", "name": "fast up button", "slug": "fast_up_button" },
+ { "emoji": "🔽", "name": "downwards button", "slug": "downwards_button" },
{
- "emoji": "🔼",
- "name": "upwards button",
- "slug": "upwards_button"
- },
- {
- "emoji": "⏫",
- "name": "fast up button",
- "slug": "fast_up_button"
- },
- {
- "emoji": "🔽",
- "name": "downwards button",
- "slug": "downwards_button"
- },
- {
- "emoji": "⏬",
+ "emoji": "⏬️",
"name": "fast down button",
"slug": "fast_down_button"
},
- {
- "emoji": "⏸️",
- "name": "pause button",
- "slug": "pause_button"
- },
- {
- "emoji": "⏹️",
- "name": "stop button",
- "slug": "stop_button"
- },
- {
- "emoji": "⏺️",
- "name": "record button",
- "slug": "record_button"
- },
- {
- "emoji": "⏏️",
- "name": "eject button",
- "slug": "eject_button"
- },
- {
- "emoji": "🎦",
- "name": "cinema",
- "slug": "cinema"
- },
- {
- "emoji": "🔅",
- "name": "dim button",
- "slug": "dim_button"
- },
- {
- "emoji": "🔆",
- "name": "bright button",
- "slug": "bright_button"
- },
- {
- "emoji": "📶",
- "name": "antenna bars",
- "slug": "antenna_bars"
- },
- {
- "emoji": "📳",
- "name": "vibration mode",
- "slug": "vibration_mode"
- },
- {
- "emoji": "📴",
- "name": "mobile phone off",
- "slug": "mobile_phone_off"
- },
- {
- "emoji": "♀️",
- "name": "female sign",
- "slug": "female_sign"
- },
- {
- "emoji": "♂️",
- "name": "male sign",
- "slug": "male_sign"
- },
+ { "emoji": "⏸️", "name": "pause button", "slug": "pause_button" },
+ { "emoji": "⏹️", "name": "stop button", "slug": "stop_button" },
+ { "emoji": "⏺️", "name": "record button", "slug": "record_button" },
+ { "emoji": "⏏️", "name": "eject button", "slug": "eject_button" },
+ { "emoji": "🎦", "name": "cinema", "slug": "cinema" },
+ { "emoji": "🔅", "name": "dim button", "slug": "dim_button" },
+ { "emoji": "🔆", "name": "bright button", "slug": "bright_button" },
+ { "emoji": "📶", "name": "antenna bars", "slug": "antenna_bars" },
+ { "emoji": "📳", "name": "vibration mode", "slug": "vibration_mode" },
+ { "emoji": "📴", "name": "mobile phone off", "slug": "mobile_phone_off" },
+ { "emoji": "♀️", "name": "female sign", "slug": "female_sign" },
+ { "emoji": "♂️", "name": "male sign", "slug": "male_sign" },
{
"emoji": "⚧️",
"name": "transgender symbol",
"slug": "transgender_symbol"
},
- {
- "emoji": "✖️",
- "name": "multiply",
- "slug": "multiply"
- },
- {
- "emoji": "➕",
- "name": "plus",
- "slug": "plus"
- },
- {
- "emoji": "➖",
- "name": "minus",
- "slug": "minus"
- },
- {
- "emoji": "➗",
- "name": "divide",
- "slug": "divide"
- },
+ { "emoji": "✖️", "name": "multiply", "slug": "multiply" },
+ { "emoji": "➕️", "name": "plus", "slug": "plus" },
+ { "emoji": "➖️", "name": "minus", "slug": "minus" },
+ { "emoji": "➗️", "name": "divide", "slug": "divide" },
{
"emoji": "🟰",
"name": "heavy equals sign",
"slug": "heavy_equals_sign"
},
- {
- "emoji": "♾️",
- "name": "infinity",
- "slug": "infinity"
- },
+ { "emoji": "♾️", "name": "infinity", "slug": "infinity" },
{
"emoji": "‼️",
"name": "double exclamation mark",
@@ -7366,30 +3330,26 @@
"slug": "exclamation_question_mark"
},
{
- "emoji": "❓",
+ "emoji": "❓️",
"name": "red question mark",
"slug": "red_question_mark"
},
{
- "emoji": "❔",
+ "emoji": "❔️",
"name": "white question mark",
"slug": "white_question_mark"
},
{
- "emoji": "❕",
+ "emoji": "❕️",
"name": "white exclamation mark",
"slug": "white_exclamation_mark"
},
{
- "emoji": "❗",
+ "emoji": "❗️",
"name": "red exclamation mark",
"slug": "red_exclamation_mark"
},
- {
- "emoji": "〰️",
- "name": "wavy dash",
- "slug": "wavy_dash"
- },
+ { "emoji": "〰️", "name": "wavy dash", "slug": "wavy_dash" },
{
"emoji": "💱",
"name": "currency exchange",
@@ -7400,43 +3360,23 @@
"name": "heavy dollar sign",
"slug": "heavy_dollar_sign"
},
- {
- "emoji": "⚕️",
- "name": "medical symbol",
- "slug": "medical_symbol"
- },
- {
- "emoji": "♻️",
- "name": "recycling symbol",
- "slug": "recycling_symbol"
- },
- {
- "emoji": "⚜️",
- "name": "fleur-de-lis",
- "slug": "fleur_de_lis"
- },
- {
- "emoji": "🔱",
- "name": "trident emblem",
- "slug": "trident_emblem"
- },
- {
- "emoji": "📛",
- "name": "name badge",
- "slug": "name_badge"
- },
+ { "emoji": "⚕️", "name": "medical symbol", "slug": "medical_symbol" },
+ { "emoji": "♻️", "name": "recycling symbol", "slug": "recycling_symbol" },
+ { "emoji": "⚜️", "name": "fleur-de-lis", "slug": "fleur_de_lis" },
+ { "emoji": "🔱", "name": "trident emblem", "slug": "trident_emblem" },
+ { "emoji": "📛", "name": "name badge", "slug": "name_badge" },
{
"emoji": "🔰",
"name": "Japanese symbol for beginner",
"slug": "japanese_symbol_for_beginner"
},
{
- "emoji": "⭕",
+ "emoji": "⭕️",
"name": "hollow red circle",
"slug": "hollow_red_circle"
},
{
- "emoji": "✅",
+ "emoji": "✅️",
"name": "check mark button",
"slug": "check_mark_button"
},
@@ -7445,28 +3385,16 @@
"name": "check box with check",
"slug": "check_box_with_check"
},
+ { "emoji": "✔️", "name": "check mark", "slug": "check_mark" },
+ { "emoji": "❌️", "name": "cross mark", "slug": "cross_mark" },
{
- "emoji": "✔️",
- "name": "check mark",
- "slug": "check_mark"
- },
- {
- "emoji": "❌",
- "name": "cross mark",
- "slug": "cross_mark"
- },
- {
- "emoji": "❎",
+ "emoji": "❎️",
"name": "cross mark button",
"slug": "cross_mark_button"
},
+ { "emoji": "➰️", "name": "curly loop", "slug": "curly_loop" },
{
- "emoji": "➰",
- "name": "curly loop",
- "slug": "curly_loop"
- },
- {
- "emoji": "➿",
+ "emoji": "➿️",
"name": "double curly loop",
"slug": "double_curly_loop"
},
@@ -7485,91 +3413,23 @@
"name": "eight-pointed star",
"slug": "eight_pointed_star"
},
- {
- "emoji": "❇️",
- "name": "sparkle",
- "slug": "sparkle"
- },
- {
- "emoji": "©️",
- "name": "copyright",
- "slug": "copyright"
- },
- {
- "emoji": "®️",
- "name": "registered",
- "slug": "registered"
- },
- {
- "emoji": "™️",
- "name": "trade mark",
- "slug": "trade_mark"
- },
- {
- "emoji": "#️⃣",
- "name": "keycap #",
- "slug": "keycap_number_sign"
- },
- {
- "emoji": "*️⃣",
- "name": "keycap *",
- "slug": "keycap_asterisk"
- },
- {
- "emoji": "0️⃣",
- "name": "keycap 0",
- "slug": "keycap_0"
- },
- {
- "emoji": "1️⃣",
- "name": "keycap 1",
- "slug": "keycap_1"
- },
- {
- "emoji": "2️⃣",
- "name": "keycap 2",
- "slug": "keycap_2"
- },
- {
- "emoji": "3️⃣",
- "name": "keycap 3",
- "slug": "keycap_3"
- },
- {
- "emoji": "4️⃣",
- "name": "keycap 4",
- "slug": "keycap_4"
- },
- {
- "emoji": "5️⃣",
- "name": "keycap 5",
- "slug": "keycap_5"
- },
- {
- "emoji": "6️⃣",
- "name": "keycap 6",
- "slug": "keycap_6"
- },
- {
- "emoji": "7️⃣",
- "name": "keycap 7",
- "slug": "keycap_7"
- },
- {
- "emoji": "8️⃣",
- "name": "keycap 8",
- "slug": "keycap_8"
- },
- {
- "emoji": "9️⃣",
- "name": "keycap 9",
- "slug": "keycap_9"
- },
- {
- "emoji": "🔟",
- "name": "keycap 10",
- "slug": "keycap_10"
- },
+ { "emoji": "❇️", "name": "sparkle", "slug": "sparkle" },
+ { "emoji": "©️", "name": "copyright", "slug": "copyright" },
+ { "emoji": "®️", "name": "registered", "slug": "registered" },
+ { "emoji": "™️", "name": "trade mark", "slug": "trade_mark" },
+ { "emoji": "#️⃣", "name": "keycap #", "slug": "keycap_number_sign" },
+ { "emoji": "*️⃣", "name": "keycap *", "slug": "keycap_asterisk" },
+ { "emoji": "0️⃣", "name": "keycap 0", "slug": "keycap_0" },
+ { "emoji": "1️⃣", "name": "keycap 1", "slug": "keycap_1" },
+ { "emoji": "2️⃣", "name": "keycap 2", "slug": "keycap_2" },
+ { "emoji": "3️⃣", "name": "keycap 3", "slug": "keycap_3" },
+ { "emoji": "4️⃣", "name": "keycap 4", "slug": "keycap_4" },
+ { "emoji": "5️⃣", "name": "keycap 5", "slug": "keycap_5" },
+ { "emoji": "6️⃣", "name": "keycap 6", "slug": "keycap_6" },
+ { "emoji": "7️⃣", "name": "keycap 7", "slug": "keycap_7" },
+ { "emoji": "8️⃣", "name": "keycap 8", "slug": "keycap_8" },
+ { "emoji": "9️⃣", "name": "keycap 9", "slug": "keycap_9" },
+ { "emoji": "🔟", "name": "keycap 10", "slug": "keycap_10" },
{
"emoji": "🔠",
"name": "input latin uppercase",
@@ -7580,106 +3440,30 @@
"name": "input latin lowercase",
"slug": "input_latin_lowercase"
},
- {
- "emoji": "🔢",
- "name": "input numbers",
- "slug": "input_numbers"
- },
- {
- "emoji": "🔣",
- "name": "input symbols",
- "slug": "input_symbols"
- },
+ { "emoji": "🔢", "name": "input numbers", "slug": "input_numbers" },
+ { "emoji": "🔣", "name": "input symbols", "slug": "input_symbols" },
{
"emoji": "🔤",
"name": "input latin letters",
"slug": "input_latin_letters"
},
- {
- "emoji": "🅰️",
- "name": "A button (blood type)",
- "slug": "a_button"
- },
- {
- "emoji": "🆎",
- "name": "AB button (blood type)",
- "slug": "ab_button"
- },
- {
- "emoji": "🅱️",
- "name": "B button (blood type)",
- "slug": "b_button"
- },
- {
- "emoji": "🆑",
- "name": "CL button",
- "slug": "cl_button"
- },
- {
- "emoji": "🆒",
- "name": "COOL button",
- "slug": "cool_button"
- },
- {
- "emoji": "🆓",
- "name": "FREE button",
- "slug": "free_button"
- },
- {
- "emoji": "ℹ️",
- "name": "information",
- "slug": "information"
- },
- {
- "emoji": "🆔",
- "name": "ID button",
- "slug": "id_button"
- },
- {
- "emoji": "Ⓜ️",
- "name": "circled M",
- "slug": "circled_m"
- },
- {
- "emoji": "🆕",
- "name": "NEW button",
- "slug": "new_button"
- },
- {
- "emoji": "🆖",
- "name": "NG button",
- "slug": "ng_button"
- },
- {
- "emoji": "🅾️",
- "name": "O button (blood type)",
- "slug": "o_button"
- },
- {
- "emoji": "🆗",
- "name": "OK button",
- "slug": "ok_button"
- },
- {
- "emoji": "🅿️",
- "name": "P button",
- "slug": "p_button"
- },
- {
- "emoji": "🆘",
- "name": "SOS button",
- "slug": "sos_button"
- },
- {
- "emoji": "🆙",
- "name": "UP! button",
- "slug": "up_button"
- },
- {
- "emoji": "🆚",
- "name": "VS button",
- "slug": "vs_button"
- },
+ { "emoji": "🅰️", "name": "A button (blood type)", "slug": "a_button" },
+ { "emoji": "🆎", "name": "AB button (blood type)", "slug": "ab_button" },
+ { "emoji": "🅱️", "name": "B button (blood type)", "slug": "b_button" },
+ { "emoji": "🆑", "name": "CL button", "slug": "cl_button" },
+ { "emoji": "🆒", "name": "COOL button", "slug": "cool_button" },
+ { "emoji": "🆓", "name": "FREE button", "slug": "free_button" },
+ { "emoji": "ℹ️", "name": "information", "slug": "information" },
+ { "emoji": "🆔", "name": "ID button", "slug": "id_button" },
+ { "emoji": "Ⓜ️", "name": "circled M", "slug": "circled_m" },
+ { "emoji": "🆕", "name": "NEW button", "slug": "new_button" },
+ { "emoji": "🆖", "name": "NG button", "slug": "ng_button" },
+ { "emoji": "🅾️", "name": "O button (blood type)", "slug": "o_button" },
+ { "emoji": "🆗", "name": "OK button", "slug": "ok_button" },
+ { "emoji": "🅿️", "name": "P button", "slug": "p_button" },
+ { "emoji": "🆘", "name": "SOS button", "slug": "sos_button" },
+ { "emoji": "🆙", "name": "UP! button", "slug": "up_button" },
+ { "emoji": "🆚", "name": "VS button", "slug": "vs_button" },
{
"emoji": "🈁",
"name": "Japanese “here” button",
@@ -7765,93 +3549,29 @@
"name": "Japanese “no vacancy” button",
"slug": "japanese_no_vacancy_button"
},
+ { "emoji": "🔴", "name": "red circle", "slug": "red_circle" },
+ { "emoji": "🟠", "name": "orange circle", "slug": "orange_circle" },
+ { "emoji": "🟡", "name": "yellow circle", "slug": "yellow_circle" },
+ { "emoji": "🟢", "name": "green circle", "slug": "green_circle" },
+ { "emoji": "🔵", "name": "blue circle", "slug": "blue_circle" },
+ { "emoji": "🟣", "name": "purple circle", "slug": "purple_circle" },
+ { "emoji": "🟤", "name": "brown circle", "slug": "brown_circle" },
+ { "emoji": "⚫️", "name": "black circle", "slug": "black_circle" },
+ { "emoji": "⚪️", "name": "white circle", "slug": "white_circle" },
+ { "emoji": "🟥", "name": "red square", "slug": "red_square" },
+ { "emoji": "🟧", "name": "orange square", "slug": "orange_square" },
+ { "emoji": "🟨", "name": "yellow square", "slug": "yellow_square" },
+ { "emoji": "🟩", "name": "green square", "slug": "green_square" },
+ { "emoji": "🟦", "name": "blue square", "slug": "blue_square" },
+ { "emoji": "🟪", "name": "purple square", "slug": "purple_square" },
+ { "emoji": "🟫", "name": "brown square", "slug": "brown_square" },
{
- "emoji": "🔴",
- "name": "red circle",
- "slug": "red_circle"
- },
- {
- "emoji": "🟠",
- "name": "orange circle",
- "slug": "orange_circle"
- },
- {
- "emoji": "🟡",
- "name": "yellow circle",
- "slug": "yellow_circle"
- },
- {
- "emoji": "🟢",
- "name": "green circle",
- "slug": "green_circle"
- },
- {
- "emoji": "🔵",
- "name": "blue circle",
- "slug": "blue_circle"
- },
- {
- "emoji": "🟣",
- "name": "purple circle",
- "slug": "purple_circle"
- },
- {
- "emoji": "🟤",
- "name": "brown circle",
- "slug": "brown_circle"
- },
- {
- "emoji": "⚫",
- "name": "black circle",
- "slug": "black_circle"
- },
- {
- "emoji": "⚪",
- "name": "white circle",
- "slug": "white_circle"
- },
- {
- "emoji": "🟥",
- "name": "red square",
- "slug": "red_square"
- },
- {
- "emoji": "🟧",
- "name": "orange square",
- "slug": "orange_square"
- },
- {
- "emoji": "🟨",
- "name": "yellow square",
- "slug": "yellow_square"
- },
- {
- "emoji": "🟩",
- "name": "green square",
- "slug": "green_square"
- },
- {
- "emoji": "🟦",
- "name": "blue square",
- "slug": "blue_square"
- },
- {
- "emoji": "🟪",
- "name": "purple square",
- "slug": "purple_square"
- },
- {
- "emoji": "🟫",
- "name": "brown square",
- "slug": "brown_square"
- },
- {
- "emoji": "⬛",
+ "emoji": "⬛️",
"name": "black large square",
"slug": "black_large_square"
},
{
- "emoji": "⬜",
+ "emoji": "⬜️",
"name": "white large square",
"slug": "white_large_square"
},
@@ -7866,12 +3586,12 @@
"slug": "white_medium_square"
},
{
- "emoji": "◾",
+ "emoji": "◾️",
"name": "black medium-small square",
"slug": "black_medium_small_square"
},
{
- "emoji": "◽",
+ "emoji": "◽️",
"name": "white medium-small square",
"slug": "white_medium_small_square"
},
@@ -7920,11 +3640,7 @@
"name": "diamond with a dot",
"slug": "diamond_with_a_dot"
},
- {
- "emoji": "🔘",
- "name": "radio button",
- "slug": "radio_button"
- },
+ { "emoji": "🔘", "name": "radio button", "slug": "radio_button" },
{
"emoji": "🔳",
"name": "white square button",
@@ -7956,226 +3672,94 @@
"name": "crossed flags",
"slug": "crossed_flags_celebration"
},
- {
- "emoji": "🏴",
- "name": "black flag",
- "slug": "black_flag_waving"
- },
- {
- "emoji": "🏳️",
- "name": "white flag",
- "slug": "white_flag_waving"
- },
- {
- "emoji": "🏳️🌈",
- "name": "rainbow flag",
- "slug": "rainbow_flag_pride"
- },
+ { "emoji": "🏴", "name": "black flag", "slug": "black_flag_waving" },
+ { "emoji": "🏳️", "name": "white flag", "slug": "white_flag_waving" },
+ { "emoji": "🏳️🌈", "name": "rainbow flag", "slug": "rainbow_flag_pride" },
{
"emoji": "🏳️⚧️",
"name": "transgender flag",
"slug": "transgender_flag_pink_white"
},
- {
- "emoji": "🏴☠️",
- "name": "pirate flag",
- "slug": "pirate_flag_treasure"
- },
+ { "emoji": "🏴☠️", "name": "pirate flag", "slug": "pirate_flag_treasure" },
{
"emoji": "🇦🇨",
"name": "flag Ascension Island",
"slug": "flag_ascension_island"
},
- {
- "emoji": "🇦🇩",
- "name": "flag Andorra",
- "slug": "flag_andorra"
- },
+ { "emoji": "🇦🇩", "name": "flag Andorra", "slug": "flag_andorra" },
{
"emoji": "🇦🇪",
"name": "flag United Arab Emirates",
"slug": "flag_united_arab_emirates"
},
- {
- "emoji": "🇦🇫",
- "name": "flag Afghanistan",
- "slug": "flag_afghanistan"
- },
+ { "emoji": "🇦🇫", "name": "flag Afghanistan", "slug": "flag_afghanistan" },
{
"emoji": "🇦🇬",
"name": "flag Antigua & Barbuda",
"slug": "flag_antigua_barbuda"
},
- {
- "emoji": "🇦🇮",
- "name": "flag Anguilla",
- "slug": "flag_anguilla"
- },
- {
- "emoji": "🇦🇱",
- "name": "flag Albania",
- "slug": "flag_albania"
- },
- {
- "emoji": "🇦🇲",
- "name": "flag Armenia",
- "slug": "flag_armenia"
- },
- {
- "emoji": "🇦🇴",
- "name": "flag Angola",
- "slug": "flag_angola"
- },
- {
- "emoji": "🇦🇶",
- "name": "flag Antarctica",
- "slug": "flag_antarctica"
- },
- {
- "emoji": "🇦🇷",
- "name": "flag Argentina",
- "slug": "flag_argentina"
- },
+ { "emoji": "🇦🇮", "name": "flag Anguilla", "slug": "flag_anguilla" },
+ { "emoji": "🇦🇱", "name": "flag Albania", "slug": "flag_albania" },
+ { "emoji": "🇦🇲", "name": "flag Armenia", "slug": "flag_armenia" },
+ { "emoji": "🇦🇴", "name": "flag Angola", "slug": "flag_angola" },
+ { "emoji": "🇦🇶", "name": "flag Antarctica", "slug": "flag_antarctica" },
+ { "emoji": "🇦🇷", "name": "flag Argentina", "slug": "flag_argentina" },
{
"emoji": "🇦🇸",
"name": "flag American Samoa",
"slug": "flag_american_samoa"
},
- {
- "emoji": "🇦🇹",
- "name": "flag Austria",
- "slug": "flag_austria"
- },
- {
- "emoji": "🇦🇺",
- "name": "flag Australia",
- "slug": "flag_australia"
- },
- {
- "emoji": "🇦🇼",
- "name": "flag Aruba",
- "slug": "flag_aruba"
- },
+ { "emoji": "🇦🇹", "name": "flag Austria", "slug": "flag_austria" },
+ { "emoji": "🇦🇺", "name": "flag Australia", "slug": "flag_australia" },
+ { "emoji": "🇦🇼", "name": "flag Aruba", "slug": "flag_aruba" },
{
"emoji": "🇦🇽",
"name": "flag Åland Islands",
"slug": "flag_aland_islands"
},
- {
- "emoji": "🇦🇿",
- "name": "flag Azerbaijan",
- "slug": "flag_azerbaijan"
- },
+ { "emoji": "🇦🇿", "name": "flag Azerbaijan", "slug": "flag_azerbaijan" },
{
"emoji": "🇧🇦",
"name": "flag Bosnia & Herzegovina",
"slug": "flag_bosnia_herzegovina"
},
- {
- "emoji": "🇧🇧",
- "name": "flag Barbados",
- "slug": "flag_barbados"
- },
- {
- "emoji": "🇧🇩",
- "name": "flag Bangladesh",
- "slug": "flag_bangladesh"
- },
- {
- "emoji": "🇧🇪",
- "name": "flag Belgium",
- "slug": "flag_belgium"
- },
+ { "emoji": "🇧🇧", "name": "flag Barbados", "slug": "flag_barbados" },
+ { "emoji": "🇧🇩", "name": "flag Bangladesh", "slug": "flag_bangladesh" },
+ { "emoji": "🇧🇪", "name": "flag Belgium", "slug": "flag_belgium" },
{
"emoji": "🇧🇫",
"name": "flag Burkina Faso",
"slug": "flag_burkina_faso"
},
- {
- "emoji": "🇧🇬",
- "name": "flag Bulgaria",
- "slug": "flag_bulgaria"
- },
- {
- "emoji": "🇧🇭",
- "name": "flag Bahrain",
- "slug": "flag_bahrain"
- },
- {
- "emoji": "🇧🇮",
- "name": "flag Burundi",
- "slug": "flag_burundi"
- },
- {
- "emoji": "🇧🇯",
- "name": "flag Benin",
- "slug": "flag_benin"
- },
+ { "emoji": "🇧🇬", "name": "flag Bulgaria", "slug": "flag_bulgaria" },
+ { "emoji": "🇧🇭", "name": "flag Bahrain", "slug": "flag_bahrain" },
+ { "emoji": "🇧🇮", "name": "flag Burundi", "slug": "flag_burundi" },
+ { "emoji": "🇧🇯", "name": "flag Benin", "slug": "flag_benin" },
{
"emoji": "🇧🇱",
"name": "flag St. Barthélemy",
"slug": "flag_st_barthelemy"
},
- {
- "emoji": "🇧🇲",
- "name": "flag Bermuda",
- "slug": "flag_bermuda"
- },
- {
- "emoji": "🇧🇳",
- "name": "flag Brunei",
- "slug": "flag_brunei"
- },
- {
- "emoji": "🇧🇴",
- "name": "flag Bolivia",
- "slug": "flag_bolivia"
- },
+ { "emoji": "🇧🇲", "name": "flag Bermuda", "slug": "flag_bermuda" },
+ { "emoji": "🇧🇳", "name": "flag Brunei", "slug": "flag_brunei" },
+ { "emoji": "🇧🇴", "name": "flag Bolivia", "slug": "flag_bolivia" },
{
"emoji": "🇧🇶",
"name": "flag Caribbean Netherlands",
"slug": "flag_caribbean_netherlands"
},
- {
- "emoji": "🇧🇷",
- "name": "flag Brazil",
- "slug": "flag_brazil"
- },
- {
- "emoji": "🇧🇸",
- "name": "flag Bahamas",
- "slug": "flag_bahamas"
- },
- {
- "emoji": "🇧🇹",
- "name": "flag Bhutan",
- "slug": "flag_bhutan"
- },
+ { "emoji": "🇧🇷", "name": "flag Brazil", "slug": "flag_brazil" },
+ { "emoji": "🇧🇸", "name": "flag Bahamas", "slug": "flag_bahamas" },
+ { "emoji": "🇧🇹", "name": "flag Bhutan", "slug": "flag_bhutan" },
{
"emoji": "🇧🇻",
"name": "flag Bouvet Island",
"slug": "flag_bouvet_island"
},
- {
- "emoji": "🇧🇼",
- "name": "flag Botswana",
- "slug": "flag_botswana"
- },
- {
- "emoji": "🇧🇾",
- "name": "flag Belarus",
- "slug": "flag_belarus"
- },
- {
- "emoji": "🇧🇿",
- "name": "flag Belize",
- "slug": "flag_belize"
- },
- {
- "emoji": "🇨🇦",
- "name": "flag Canada",
- "slug": "flag_canada"
- },
+ { "emoji": "🇧🇼", "name": "flag Botswana", "slug": "flag_botswana" },
+ { "emoji": "🇧🇾", "name": "flag Belarus", "slug": "flag_belarus" },
+ { "emoji": "🇧🇿", "name": "flag Belize", "slug": "flag_belize" },
+ { "emoji": "🇨🇦", "name": "flag Canada", "slug": "flag_canada" },
{
"emoji": "🇨🇨",
"name": "flag Cocos (Keeling) Islands",
@@ -8196,11 +3780,7 @@
"name": "flag Congo - Brazzaville",
"slug": "flag_congo_brazzaville"
},
- {
- "emoji": "🇨🇭",
- "name": "flag Switzerland",
- "slug": "flag_switzerland"
- },
+ { "emoji": "🇨🇭", "name": "flag Switzerland", "slug": "flag_switzerland" },
{
"emoji": "🇨🇮",
"name": "flag Côte d’Ivoire",
@@ -8211,271 +3791,115 @@
"name": "flag Cook Islands",
"slug": "flag_cook_islands"
},
- {
- "emoji": "🇨🇱",
- "name": "flag Chile",
- "slug": "flag_chile"
- },
- {
- "emoji": "🇨🇲",
- "name": "flag Cameroon",
- "slug": "flag_cameroon"
- },
- {
- "emoji": "🇨🇳",
- "name": "flag China",
- "slug": "flag_china"
- },
- {
- "emoji": "🇨🇴",
- "name": "flag Colombia",
- "slug": "flag_colombia"
- },
+ { "emoji": "🇨🇱", "name": "flag Chile", "slug": "flag_chile" },
+ { "emoji": "🇨🇲", "name": "flag Cameroon", "slug": "flag_cameroon" },
+ { "emoji": "🇨🇳", "name": "flag China", "slug": "flag_china" },
+ { "emoji": "🇨🇴", "name": "flag Colombia", "slug": "flag_colombia" },
{
"emoji": "🇨🇵",
"name": "flag Clipperton Island",
"slug": "flag_clipperton_island"
},
- {
- "emoji": "🇨🇷",
- "name": "flag Costa Rica",
- "slug": "flag_costa_rica"
- },
- {
- "emoji": "🇨🇺",
- "name": "flag Cuba",
- "slug": "flag_cuba"
- },
- {
- "emoji": "🇨🇻",
- "name": "flag Cape Verde",
- "slug": "flag_cape_verde"
- },
- {
- "emoji": "🇨🇼",
- "name": "flag Curaçao",
- "slug": "flag_curacao"
- },
+ { "emoji": "🇨🇷", "name": "flag Costa Rica", "slug": "flag_costa_rica" },
+ { "emoji": "🇨🇺", "name": "flag Cuba", "slug": "flag_cuba" },
+ { "emoji": "🇨🇻", "name": "flag Cape Verde", "slug": "flag_cape_verde" },
+ { "emoji": "🇨🇼", "name": "flag Curaçao", "slug": "flag_curacao" },
{
"emoji": "🇨🇽",
"name": "flag Christmas Island",
"slug": "flag_christmas_island"
},
- {
- "emoji": "🇨🇾",
- "name": "flag Cyprus",
- "slug": "flag_cyprus"
- },
- {
- "emoji": "🇨🇿",
- "name": "flag Czechia",
- "slug": "flag_czechia"
- },
- {
- "emoji": "🇩🇪",
- "name": "flag Germany",
- "slug": "flag_germany"
- },
+ { "emoji": "🇨🇾", "name": "flag Cyprus", "slug": "flag_cyprus" },
+ { "emoji": "🇨🇿", "name": "flag Czechia", "slug": "flag_czechia" },
+ { "emoji": "🇩🇪", "name": "flag Germany", "slug": "flag_germany" },
{
"emoji": "🇩🇬",
"name": "flag Diego Garcia",
"slug": "flag_diego_garcia"
},
- {
- "emoji": "🇩🇯",
- "name": "flag Djibouti",
- "slug": "flag_djibouti"
- },
- {
- "emoji": "🇩🇰",
- "name": "flag Denmark",
- "slug": "flag_denmark"
- },
- {
- "emoji": "🇩🇲",
- "name": "flag Dominica",
- "slug": "flag_dominica"
- },
+ { "emoji": "🇩🇯", "name": "flag Djibouti", "slug": "flag_djibouti" },
+ { "emoji": "🇩🇰", "name": "flag Denmark", "slug": "flag_denmark" },
+ { "emoji": "🇩🇲", "name": "flag Dominica", "slug": "flag_dominica" },
{
"emoji": "🇩🇴",
"name": "flag Dominican Republic",
"slug": "flag_dominican_republic"
},
- {
- "emoji": "🇩🇿",
- "name": "flag Algeria",
- "slug": "flag_algeria"
- },
+ { "emoji": "🇩🇿", "name": "flag Algeria", "slug": "flag_algeria" },
{
"emoji": "🇪🇦",
"name": "flag Ceuta & Melilla",
"slug": "flag_ceuta_melilla"
},
- {
- "emoji": "🇪🇨",
- "name": "flag Ecuador",
- "slug": "flag_ecuador"
- },
- {
- "emoji": "🇪🇪",
- "name": "flag Estonia",
- "slug": "flag_estonia"
- },
- {
- "emoji": "🇪🇬",
- "name": "flag Egypt",
- "slug": "flag_egypt"
- },
+ { "emoji": "🇪🇨", "name": "flag Ecuador", "slug": "flag_ecuador" },
+ { "emoji": "🇪🇪", "name": "flag Estonia", "slug": "flag_estonia" },
+ { "emoji": "🇪🇬", "name": "flag Egypt", "slug": "flag_egypt" },
{
"emoji": "🇪🇭",
"name": "flag Western Sahara",
"slug": "flag_western_sahara"
},
- {
- "emoji": "🇪🇷",
- "name": "flag Eritrea",
- "slug": "flag_eritrea"
- },
- {
- "emoji": "🇪🇸",
- "name": "flag Spain",
- "slug": "flag_spain"
- },
- {
- "emoji": "🇪🇹",
- "name": "flag Ethiopia",
- "slug": "flag_ethiopia"
- },
+ { "emoji": "🇪🇷", "name": "flag Eritrea", "slug": "flag_eritrea" },
+ { "emoji": "🇪🇸", "name": "flag Spain", "slug": "flag_spain" },
+ { "emoji": "🇪🇹", "name": "flag Ethiopia", "slug": "flag_ethiopia" },
{
"emoji": "🇪🇺",
"name": "flag European Union",
"slug": "flag_european_union"
},
- {
- "emoji": "🇫🇮",
- "name": "flag Finland",
- "slug": "flag_finland"
- },
- {
- "emoji": "🇫🇯",
- "name": "flag Fiji",
- "slug": "flag_fiji"
- },
+ { "emoji": "🇫🇮", "name": "flag Finland", "slug": "flag_finland" },
+ { "emoji": "🇫🇯", "name": "flag Fiji", "slug": "flag_fiji" },
{
"emoji": "🇫🇰",
"name": "flag Falkland Islands",
"slug": "flag_falkland_islands"
},
- {
- "emoji": "🇫🇲",
- "name": "flag Micronesia",
- "slug": "flag_micronesia"
- },
+ { "emoji": "🇫🇲", "name": "flag Micronesia", "slug": "flag_micronesia" },
{
"emoji": "🇫🇴",
"name": "flag Faroe Islands",
"slug": "flag_faroe_islands"
},
- {
- "emoji": "🇫🇷",
- "name": "flag France",
- "slug": "flag_france"
- },
- {
- "emoji": "🇬🇦",
- "name": "flag Gabon",
- "slug": "flag_gabon"
- },
+ { "emoji": "🇫🇷", "name": "flag France", "slug": "flag_france" },
+ { "emoji": "🇬🇦", "name": "flag Gabon", "slug": "flag_gabon" },
{
"emoji": "🇬🇧",
"name": "flag United Kingdom",
"slug": "flag_united_kingdom"
},
- {
- "emoji": "🇬🇩",
- "name": "flag Grenada",
- "slug": "flag_grenada"
- },
- {
- "emoji": "🇬🇪",
- "name": "flag Georgia",
- "slug": "flag_georgia"
- },
+ { "emoji": "🇬🇩", "name": "flag Grenada", "slug": "flag_grenada" },
+ { "emoji": "🇬🇪", "name": "flag Georgia", "slug": "flag_georgia" },
{
"emoji": "🇬🇫",
"name": "flag French Guiana",
"slug": "flag_french_guiana"
},
- {
- "emoji": "🇬🇬",
- "name": "flag Guernsey",
- "slug": "flag_guernsey"
- },
- {
- "emoji": "🇬🇭",
- "name": "flag Ghana",
- "slug": "flag_ghana"
- },
- {
- "emoji": "🇬🇮",
- "name": "flag Gibraltar",
- "slug": "flag_gibraltar"
- },
- {
- "emoji": "🇬🇱",
- "name": "flag Greenland",
- "slug": "flag_greenland"
- },
- {
- "emoji": "🇬🇲",
- "name": "flag Gambia",
- "slug": "flag_gambia"
- },
- {
- "emoji": "🇬🇳",
- "name": "flag Guinea",
- "slug": "flag_guinea"
- },
- {
- "emoji": "🇬🇵",
- "name": "flag Guadeloupe",
- "slug": "flag_guadeloupe"
- },
+ { "emoji": "🇬🇬", "name": "flag Guernsey", "slug": "flag_guernsey" },
+ { "emoji": "🇬🇭", "name": "flag Ghana", "slug": "flag_ghana" },
+ { "emoji": "🇬🇮", "name": "flag Gibraltar", "slug": "flag_gibraltar" },
+ { "emoji": "🇬🇱", "name": "flag Greenland", "slug": "flag_greenland" },
+ { "emoji": "🇬🇲", "name": "flag Gambia", "slug": "flag_gambia" },
+ { "emoji": "🇬🇳", "name": "flag Guinea", "slug": "flag_guinea" },
+ { "emoji": "🇬🇵", "name": "flag Guadeloupe", "slug": "flag_guadeloupe" },
{
"emoji": "🇬🇶",
"name": "flag Equatorial Guinea",
"slug": "flag_equatorial_guinea"
},
- {
- "emoji": "🇬🇷",
- "name": "flag Greece",
- "slug": "flag_greece"
- },
+ { "emoji": "🇬🇷", "name": "flag Greece", "slug": "flag_greece" },
{
"emoji": "🇬🇸",
"name": "flag South Georgia & South Sandwich Islands",
"slug": "flag_south_georgia_south_sandwich_islands"
},
- {
- "emoji": "🇬🇹",
- "name": "flag Guatemala",
- "slug": "flag_guatemala"
- },
- {
- "emoji": "🇬🇺",
- "name": "flag Guam",
- "slug": "flag_guam"
- },
+ { "emoji": "🇬🇹", "name": "flag Guatemala", "slug": "flag_guatemala" },
+ { "emoji": "🇬🇺", "name": "flag Guam", "slug": "flag_guam" },
{
"emoji": "🇬🇼",
"name": "flag Guinea-Bissau",
"slug": "flag_guinea_bissau"
},
- {
- "emoji": "🇬🇾",
- "name": "flag Guyana",
- "slug": "flag_guyana"
- },
+ { "emoji": "🇬🇾", "name": "flag Guyana", "slug": "flag_guyana" },
{
"emoji": "🇭🇰",
"name": "flag Hong Kong SAR China",
@@ -8486,241 +3910,73 @@
"name": "flag Heard & McDonald Islands",
"slug": "flag_heard_mcdonald_islands"
},
- {
- "emoji": "🇭🇳",
- "name": "flag Honduras",
- "slug": "flag_honduras"
- },
- {
- "emoji": "🇭🇷",
- "name": "flag Croatia",
- "slug": "flag_croatia"
- },
- {
- "emoji": "🇭🇹",
- "name": "flag Haiti",
- "slug": "flag_haiti"
- },
- {
- "emoji": "🇭🇺",
- "name": "flag Hungary",
- "slug": "flag_hungary"
- },
+ { "emoji": "🇭🇳", "name": "flag Honduras", "slug": "flag_honduras" },
+ { "emoji": "🇭🇷", "name": "flag Croatia", "slug": "flag_croatia" },
+ { "emoji": "🇭🇹", "name": "flag Haiti", "slug": "flag_haiti" },
+ { "emoji": "🇭🇺", "name": "flag Hungary", "slug": "flag_hungary" },
{
"emoji": "🇮🇨",
"name": "flag Canary Islands",
"slug": "flag_canary_islands"
},
- {
- "emoji": "🇮🇩",
- "name": "flag Indonesia",
- "slug": "flag_indonesia"
- },
- {
- "emoji": "🇮🇪",
- "name": "flag Ireland",
- "slug": "flag_ireland"
- },
- {
- "emoji": "🇮🇱",
- "name": "flag Israel",
- "slug": "flag_israel"
- },
- {
- "emoji": "🇮🇲",
- "name": "flag Isle of Man",
- "slug": "flag_isle_of_man"
- },
- {
- "emoji": "🇮🇳",
- "name": "flag India",
- "slug": "flag_india"
- },
+ { "emoji": "🇮🇩", "name": "flag Indonesia", "slug": "flag_indonesia" },
+ { "emoji": "🇮🇪", "name": "flag Ireland", "slug": "flag_ireland" },
+ { "emoji": "🇮🇱", "name": "flag Israel", "slug": "flag_israel" },
+ { "emoji": "🇮🇲", "name": "flag Isle of Man", "slug": "flag_isle_of_man" },
+ { "emoji": "🇮🇳", "name": "flag India", "slug": "flag_india" },
{
"emoji": "🇮🇴",
"name": "flag British Indian Ocean Territory",
"slug": "flag_british_indian_ocean_territory"
},
- {
- "emoji": "🇮🇶",
- "name": "flag Iraq",
- "slug": "flag_iraq"
- },
- {
- "emoji": "🇮🇷",
- "name": "flag Iran",
- "slug": "flag_iran"
- },
- {
- "emoji": "🇮🇸",
- "name": "flag Iceland",
- "slug": "flag_iceland"
- },
- {
- "emoji": "🇮🇹",
- "name": "flag Italy",
- "slug": "flag_italy"
- },
- {
- "emoji": "🇯🇪",
- "name": "flag Jersey",
- "slug": "flag_jersey"
- },
- {
- "emoji": "🇯🇲",
- "name": "flag Jamaica",
- "slug": "flag_jamaica"
- },
- {
- "emoji": "🇯🇴",
- "name": "flag Jordan",
- "slug": "flag_jordan"
- },
- {
- "emoji": "🇯🇵",
- "name": "flag Japan",
- "slug": "flag_japan"
- },
- {
- "emoji": "🇰🇪",
- "name": "flag Kenya",
- "slug": "flag_kenya"
- },
- {
- "emoji": "🇰🇬",
- "name": "flag Kyrgyzstan",
- "slug": "flag_kyrgyzstan"
- },
- {
- "emoji": "🇰🇭",
- "name": "flag Cambodia",
- "slug": "flag_cambodia"
- },
- {
- "emoji": "🇰🇮",
- "name": "flag Kiribati",
- "slug": "flag_kiribati"
- },
- {
- "emoji": "🇰🇲",
- "name": "flag Comoros",
- "slug": "flag_comoros"
- },
+ { "emoji": "🇮🇶", "name": "flag Iraq", "slug": "flag_iraq" },
+ { "emoji": "🇮🇷", "name": "flag Iran", "slug": "flag_iran" },
+ { "emoji": "🇮🇸", "name": "flag Iceland", "slug": "flag_iceland" },
+ { "emoji": "🇮🇹", "name": "flag Italy", "slug": "flag_italy" },
+ { "emoji": "🇯🇪", "name": "flag Jersey", "slug": "flag_jersey" },
+ { "emoji": "🇯🇲", "name": "flag Jamaica", "slug": "flag_jamaica" },
+ { "emoji": "🇯🇴", "name": "flag Jordan", "slug": "flag_jordan" },
+ { "emoji": "🇯🇵", "name": "flag Japan", "slug": "flag_japan" },
+ { "emoji": "🇰🇪", "name": "flag Kenya", "slug": "flag_kenya" },
+ { "emoji": "🇰🇬", "name": "flag Kyrgyzstan", "slug": "flag_kyrgyzstan" },
+ { "emoji": "🇰🇭", "name": "flag Cambodia", "slug": "flag_cambodia" },
+ { "emoji": "🇰🇮", "name": "flag Kiribati", "slug": "flag_kiribati" },
+ { "emoji": "🇰🇲", "name": "flag Comoros", "slug": "flag_comoros" },
{
"emoji": "🇰🇳",
"name": "flag St. Kitts & Nevis",
"slug": "flag_st_kitts_nevis"
},
- {
- "emoji": "🇰🇵",
- "name": "flag North Korea",
- "slug": "flag_north_korea"
- },
- {
- "emoji": "🇰🇷",
- "name": "flag South Korea",
- "slug": "flag_south_korea"
- },
- {
- "emoji": "🇰🇼",
- "name": "flag Kuwait",
- "slug": "flag_kuwait"
- },
+ { "emoji": "🇰🇵", "name": "flag North Korea", "slug": "flag_north_korea" },
+ { "emoji": "🇰🇷", "name": "flag South Korea", "slug": "flag_south_korea" },
+ { "emoji": "🇰🇼", "name": "flag Kuwait", "slug": "flag_kuwait" },
{
"emoji": "🇰🇾",
"name": "flag Cayman Islands",
"slug": "flag_cayman_islands"
},
- {
- "emoji": "🇰🇿",
- "name": "flag Kazakhstan",
- "slug": "flag_kazakhstan"
- },
- {
- "emoji": "🇱🇦",
- "name": "flag Laos",
- "slug": "flag_laos"
- },
- {
- "emoji": "🇱🇧",
- "name": "flag Lebanon",
- "slug": "flag_lebanon"
- },
- {
- "emoji": "🇱🇨",
- "name": "flag St. Lucia",
- "slug": "flag_st_lucia"
- },
+ { "emoji": "🇰🇿", "name": "flag Kazakhstan", "slug": "flag_kazakhstan" },
+ { "emoji": "🇱🇦", "name": "flag Laos", "slug": "flag_laos" },
+ { "emoji": "🇱🇧", "name": "flag Lebanon", "slug": "flag_lebanon" },
+ { "emoji": "🇱🇨", "name": "flag St. Lucia", "slug": "flag_st_lucia" },
{
"emoji": "🇱🇮",
"name": "flag Liechtenstein",
"slug": "flag_liechtenstein"
},
- {
- "emoji": "🇱🇰",
- "name": "flag Sri Lanka",
- "slug": "flag_sri_lanka"
- },
- {
- "emoji": "🇱🇷",
- "name": "flag Liberia",
- "slug": "flag_liberia"
- },
- {
- "emoji": "🇱🇸",
- "name": "flag Lesotho",
- "slug": "flag_lesotho"
- },
- {
- "emoji": "🇱🇹",
- "name": "flag Lithuania",
- "slug": "flag_lithuania"
- },
- {
- "emoji": "🇱🇺",
- "name": "flag Luxembourg",
- "slug": "flag_luxembourg"
- },
- {
- "emoji": "🇱🇻",
- "name": "flag Latvia",
- "slug": "flag_latvia"
- },
- {
- "emoji": "🇱🇾",
- "name": "flag Libya",
- "slug": "flag_libya"
- },
- {
- "emoji": "🇲🇦",
- "name": "flag Morocco",
- "slug": "flag_morocco"
- },
- {
- "emoji": "🇲🇨",
- "name": "flag Monaco",
- "slug": "flag_monaco"
- },
- {
- "emoji": "🇲🇩",
- "name": "flag Moldova",
- "slug": "flag_moldova"
- },
- {
- "emoji": "🇲🇪",
- "name": "flag Montenegro",
- "slug": "flag_montenegro"
- },
- {
- "emoji": "🇲🇫",
- "name": "flag St. Martin",
- "slug": "flag_st_martin"
- },
- {
- "emoji": "🇲🇬",
- "name": "flag Madagascar",
- "slug": "flag_madagascar"
- },
+ { "emoji": "🇱🇰", "name": "flag Sri Lanka", "slug": "flag_sri_lanka" },
+ { "emoji": "🇱🇷", "name": "flag Liberia", "slug": "flag_liberia" },
+ { "emoji": "🇱🇸", "name": "flag Lesotho", "slug": "flag_lesotho" },
+ { "emoji": "🇱🇹", "name": "flag Lithuania", "slug": "flag_lithuania" },
+ { "emoji": "🇱🇺", "name": "flag Luxembourg", "slug": "flag_luxembourg" },
+ { "emoji": "🇱🇻", "name": "flag Latvia", "slug": "flag_latvia" },
+ { "emoji": "🇱🇾", "name": "flag Libya", "slug": "flag_libya" },
+ { "emoji": "🇲🇦", "name": "flag Morocco", "slug": "flag_morocco" },
+ { "emoji": "🇲🇨", "name": "flag Monaco", "slug": "flag_monaco" },
+ { "emoji": "🇲🇩", "name": "flag Moldova", "slug": "flag_moldova" },
+ { "emoji": "🇲🇪", "name": "flag Montenegro", "slug": "flag_montenegro" },
+ { "emoji": "🇲🇫", "name": "flag St. Martin", "slug": "flag_st_martin" },
+ { "emoji": "🇲🇬", "name": "flag Madagascar", "slug": "flag_madagascar" },
{
"emoji": "🇲🇭",
"name": "flag Marshall Islands",
@@ -8731,21 +3987,9 @@
"name": "flag North Macedonia",
"slug": "flag_north_macedonia"
},
- {
- "emoji": "🇲🇱",
- "name": "flag Mali",
- "slug": "flag_mali"
- },
- {
- "emoji": "🇲🇲",
- "name": "flag Myanmar (Burma)",
- "slug": "flag_myanmar"
- },
- {
- "emoji": "🇲🇳",
- "name": "flag Mongolia",
- "slug": "flag_mongolia"
- },
+ { "emoji": "🇲🇱", "name": "flag Mali", "slug": "flag_mali" },
+ { "emoji": "🇲🇲", "name": "flag Myanmar (Burma)", "slug": "flag_myanmar" },
+ { "emoji": "🇲🇳", "name": "flag Mongolia", "slug": "flag_mongolia" },
{
"emoji": "🇲🇴",
"name": "flag Macao SAR China",
@@ -8756,131 +4000,39 @@
"name": "flag Northern Mariana Islands",
"slug": "flag_northern_mariana_islands"
},
- {
- "emoji": "🇲🇶",
- "name": "flag Martinique",
- "slug": "flag_martinique"
- },
- {
- "emoji": "🇲🇷",
- "name": "flag Mauritania",
- "slug": "flag_mauritania"
- },
- {
- "emoji": "🇲🇸",
- "name": "flag Montserrat",
- "slug": "flag_montserrat"
- },
- {
- "emoji": "🇲🇹",
- "name": "flag Malta",
- "slug": "flag_malta"
- },
- {
- "emoji": "🇲🇺",
- "name": "flag Mauritius",
- "slug": "flag_mauritius"
- },
- {
- "emoji": "🇲🇻",
- "name": "flag Maldives",
- "slug": "flag_maldives"
- },
- {
- "emoji": "🇲🇼",
- "name": "flag Malawi",
- "slug": "flag_malawi"
- },
- {
- "emoji": "🇲🇽",
- "name": "flag Mexico",
- "slug": "flag_mexico"
- },
- {
- "emoji": "🇲🇾",
- "name": "flag Malaysia",
- "slug": "flag_malaysia"
- },
- {
- "emoji": "🇲🇿",
- "name": "flag Mozambique",
- "slug": "flag_mozambique"
- },
- {
- "emoji": "🇳🇦",
- "name": "flag Namibia",
- "slug": "flag_namibia"
- },
+ { "emoji": "🇲🇶", "name": "flag Martinique", "slug": "flag_martinique" },
+ { "emoji": "🇲🇷", "name": "flag Mauritania", "slug": "flag_mauritania" },
+ { "emoji": "🇲🇸", "name": "flag Montserrat", "slug": "flag_montserrat" },
+ { "emoji": "🇲🇹", "name": "flag Malta", "slug": "flag_malta" },
+ { "emoji": "🇲🇺", "name": "flag Mauritius", "slug": "flag_mauritius" },
+ { "emoji": "🇲🇻", "name": "flag Maldives", "slug": "flag_maldives" },
+ { "emoji": "🇲🇼", "name": "flag Malawi", "slug": "flag_malawi" },
+ { "emoji": "🇲🇽", "name": "flag Mexico", "slug": "flag_mexico" },
+ { "emoji": "🇲🇾", "name": "flag Malaysia", "slug": "flag_malaysia" },
+ { "emoji": "🇲🇿", "name": "flag Mozambique", "slug": "flag_mozambique" },
+ { "emoji": "🇳🇦", "name": "flag Namibia", "slug": "flag_namibia" },
{
"emoji": "🇳🇨",
"name": "flag New Caledonia",
"slug": "flag_new_caledonia"
},
- {
- "emoji": "🇳🇪",
- "name": "flag Niger",
- "slug": "flag_niger"
- },
+ { "emoji": "🇳🇪", "name": "flag Niger", "slug": "flag_niger" },
{
"emoji": "🇳🇫",
"name": "flag Norfolk Island",
"slug": "flag_norfolk_island"
},
- {
- "emoji": "🇳🇬",
- "name": "flag Nigeria",
- "slug": "flag_nigeria"
- },
- {
- "emoji": "🇳🇮",
- "name": "flag Nicaragua",
- "slug": "flag_nicaragua"
- },
- {
- "emoji": "🇳🇱",
- "name": "flag Netherlands",
- "slug": "flag_netherlands"
- },
- {
- "emoji": "🇳🇴",
- "name": "flag Norway",
- "slug": "flag_norway"
- },
- {
- "emoji": "🇳🇵",
- "name": "flag Nepal",
- "slug": "flag_nepal"
- },
- {
- "emoji": "🇳🇷",
- "name": "flag Nauru",
- "slug": "flag_nauru"
- },
- {
- "emoji": "🇳🇺",
- "name": "flag Niue",
- "slug": "flag_niue"
- },
- {
- "emoji": "🇳🇿",
- "name": "flag New Zealand",
- "slug": "flag_new_zealand"
- },
- {
- "emoji": "🇴🇲",
- "name": "flag Oman",
- "slug": "flag_oman"
- },
- {
- "emoji": "🇵🇦",
- "name": "flag Panama",
- "slug": "flag_panama"
- },
- {
- "emoji": "🇵🇪",
- "name": "flag Peru",
- "slug": "flag_peru"
- },
+ { "emoji": "🇳🇬", "name": "flag Nigeria", "slug": "flag_nigeria" },
+ { "emoji": "🇳🇮", "name": "flag Nicaragua", "slug": "flag_nicaragua" },
+ { "emoji": "🇳🇱", "name": "flag Netherlands", "slug": "flag_netherlands" },
+ { "emoji": "🇳🇴", "name": "flag Norway", "slug": "flag_norway" },
+ { "emoji": "🇳🇵", "name": "flag Nepal", "slug": "flag_nepal" },
+ { "emoji": "🇳🇷", "name": "flag Nauru", "slug": "flag_nauru" },
+ { "emoji": "🇳🇺", "name": "flag Niue", "slug": "flag_niue" },
+ { "emoji": "🇳🇿", "name": "flag New Zealand", "slug": "flag_new_zealand" },
+ { "emoji": "🇴🇲", "name": "flag Oman", "slug": "flag_oman" },
+ { "emoji": "🇵🇦", "name": "flag Panama", "slug": "flag_panama" },
+ { "emoji": "🇵🇪", "name": "flag Peru", "slug": "flag_peru" },
{
"emoji": "🇵🇫",
"name": "flag French Polynesia",
@@ -8891,21 +4043,9 @@
"name": "flag Papua New Guinea",
"slug": "flag_papua_new_guinea"
},
- {
- "emoji": "🇵🇭",
- "name": "flag Philippines",
- "slug": "flag_philippines"
- },
- {
- "emoji": "🇵🇰",
- "name": "flag Pakistan",
- "slug": "flag_pakistan"
- },
- {
- "emoji": "🇵🇱",
- "name": "flag Poland",
- "slug": "flag_poland"
- },
+ { "emoji": "🇵🇭", "name": "flag Philippines", "slug": "flag_philippines" },
+ { "emoji": "🇵🇰", "name": "flag Pakistan", "slug": "flag_pakistan" },
+ { "emoji": "🇵🇱", "name": "flag Poland", "slug": "flag_poland" },
{
"emoji": "🇵🇲",
"name": "flag St. Pierre & Miquelon",
@@ -8916,61 +4056,21 @@
"name": "flag Pitcairn Islands",
"slug": "flag_pitcairn_islands"
},
- {
- "emoji": "🇵🇷",
- "name": "flag Puerto Rico",
- "slug": "flag_puerto_rico"
- },
+ { "emoji": "🇵🇷", "name": "flag Puerto Rico", "slug": "flag_puerto_rico" },
{
"emoji": "🇵🇸",
"name": "flag Palestinian Territories",
"slug": "flag_palestinian_territories"
},
- {
- "emoji": "🇵🇹",
- "name": "flag Portugal",
- "slug": "flag_portugal"
- },
- {
- "emoji": "🇵🇼",
- "name": "flag Palau",
- "slug": "flag_palau"
- },
- {
- "emoji": "🇵🇾",
- "name": "flag Paraguay",
- "slug": "flag_paraguay"
- },
- {
- "emoji": "🇶🇦",
- "name": "flag Qatar",
- "slug": "flag_qatar"
- },
- {
- "emoji": "🇷🇪",
- "name": "flag Réunion",
- "slug": "flag_reunion"
- },
- {
- "emoji": "🇷🇴",
- "name": "flag Romania",
- "slug": "flag_romania"
- },
- {
- "emoji": "🇷🇸",
- "name": "flag Serbia",
- "slug": "flag_serbia"
- },
- {
- "emoji": "🇷🇺",
- "name": "flag Russia",
- "slug": "flag_russia"
- },
- {
- "emoji": "🇷🇼",
- "name": "flag Rwanda",
- "slug": "flag_rwanda"
- },
+ { "emoji": "🇵🇹", "name": "flag Portugal", "slug": "flag_portugal" },
+ { "emoji": "🇵🇼", "name": "flag Palau", "slug": "flag_palau" },
+ { "emoji": "🇵🇾", "name": "flag Paraguay", "slug": "flag_paraguay" },
+ { "emoji": "🇶🇦", "name": "flag Qatar", "slug": "flag_qatar" },
+ { "emoji": "🇷🇪", "name": "flag Réunion", "slug": "flag_reunion" },
+ { "emoji": "🇷🇴", "name": "flag Romania", "slug": "flag_romania" },
+ { "emoji": "🇷🇸", "name": "flag Serbia", "slug": "flag_serbia" },
+ { "emoji": "🇷🇺", "name": "flag Russia", "slug": "flag_russia" },
+ { "emoji": "🇷🇼", "name": "flag Rwanda", "slug": "flag_rwanda" },
{
"emoji": "🇸🇦",
"name": "flag Saudi Arabia",
@@ -8981,101 +4081,41 @@
"name": "flag Solomon Islands",
"slug": "flag_solomon_islands"
},
- {
- "emoji": "🇸🇨",
- "name": "flag Seychelles",
- "slug": "flag_seychelles"
- },
- {
- "emoji": "🇸🇩",
- "name": "flag Sudan",
- "slug": "flag_sudan"
- },
- {
- "emoji": "🇸🇪",
- "name": "flag Sweden",
- "slug": "flag_sweden"
- },
- {
- "emoji": "🇸🇬",
- "name": "flag Singapore",
- "slug": "flag_singapore"
- },
- {
- "emoji": "🇸🇭",
- "name": "flag St. Helena",
- "slug": "flag_st_helena"
- },
- {
- "emoji": "🇸🇮",
- "name": "flag Slovenia",
- "slug": "flag_slovenia"
- },
+ { "emoji": "🇸🇨", "name": "flag Seychelles", "slug": "flag_seychelles" },
+ { "emoji": "🇸🇩", "name": "flag Sudan", "slug": "flag_sudan" },
+ { "emoji": "🇸🇪", "name": "flag Sweden", "slug": "flag_sweden" },
+ { "emoji": "🇸🇬", "name": "flag Singapore", "slug": "flag_singapore" },
+ { "emoji": "🇸🇭", "name": "flag St. Helena", "slug": "flag_st_helena" },
+ { "emoji": "🇸🇮", "name": "flag Slovenia", "slug": "flag_slovenia" },
{
"emoji": "🇸🇯",
"name": "flag Svalbard & Jan Mayen",
"slug": "flag_svalbard_jan_mayen"
},
- {
- "emoji": "🇸🇰",
- "name": "flag Slovakia",
- "slug": "flag_slovakia"
- },
+ { "emoji": "🇸🇰", "name": "flag Slovakia", "slug": "flag_slovakia" },
{
"emoji": "🇸🇱",
"name": "flag Sierra Leone",
"slug": "flag_sierra_leone"
},
- {
- "emoji": "🇸🇲",
- "name": "flag San Marino",
- "slug": "flag_san_marino"
- },
- {
- "emoji": "🇸🇳",
- "name": "flag Senegal",
- "slug": "flag_senegal"
- },
- {
- "emoji": "🇸🇴",
- "name": "flag Somalia",
- "slug": "flag_somalia"
- },
- {
- "emoji": "🇸🇷",
- "name": "flag Suriname",
- "slug": "flag_suriname"
- },
- {
- "emoji": "🇸🇸",
- "name": "flag South Sudan",
- "slug": "flag_south_sudan"
- },
+ { "emoji": "🇸🇲", "name": "flag San Marino", "slug": "flag_san_marino" },
+ { "emoji": "🇸🇳", "name": "flag Senegal", "slug": "flag_senegal" },
+ { "emoji": "🇸🇴", "name": "flag Somalia", "slug": "flag_somalia" },
+ { "emoji": "🇸🇷", "name": "flag Suriname", "slug": "flag_suriname" },
+ { "emoji": "🇸🇸", "name": "flag South Sudan", "slug": "flag_south_sudan" },
{
"emoji": "🇸🇹",
"name": "flag São Tomé & Príncipe",
"slug": "flag_sao_tome_principe"
},
- {
- "emoji": "🇸🇻",
- "name": "flag El Salvador",
- "slug": "flag_el_salvador"
- },
+ { "emoji": "🇸🇻", "name": "flag El Salvador", "slug": "flag_el_salvador" },
{
"emoji": "🇸🇽",
"name": "flag Sint Maarten",
"slug": "flag_sint_maarten"
},
- {
- "emoji": "🇸🇾",
- "name": "flag Syria",
- "slug": "flag_syria"
- },
- {
- "emoji": "🇸🇿",
- "name": "flag Eswatini",
- "slug": "flag_eswatini"
- },
+ { "emoji": "🇸🇾", "name": "flag Syria", "slug": "flag_syria" },
+ { "emoji": "🇸🇿", "name": "flag Eswatini", "slug": "flag_eswatini" },
{
"emoji": "🇹🇦",
"name": "flag Tristan da Cunha",
@@ -9086,91 +4126,35 @@
"name": "flag Turks & Caicos Islands",
"slug": "flag_turks_caicos_islands"
},
- {
- "emoji": "🇹🇩",
- "name": "flag Chad",
- "slug": "flag_chad"
- },
+ { "emoji": "🇹🇩", "name": "flag Chad", "slug": "flag_chad" },
{
"emoji": "🇹🇫",
"name": "flag French Southern Territories",
"slug": "flag_french_southern_territories"
},
- {
- "emoji": "🇹🇬",
- "name": "flag Togo",
- "slug": "flag_togo"
- },
- {
- "emoji": "🇹🇭",
- "name": "flag Thailand",
- "slug": "flag_thailand"
- },
- {
- "emoji": "🇹🇯",
- "name": "flag Tajikistan",
- "slug": "flag_tajikistan"
- },
- {
- "emoji": "🇹🇰",
- "name": "flag Tokelau",
- "slug": "flag_tokelau"
- },
- {
- "emoji": "🇹🇱",
- "name": "flag Timor-Leste",
- "slug": "flag_timor_leste"
- },
+ { "emoji": "🇹🇬", "name": "flag Togo", "slug": "flag_togo" },
+ { "emoji": "🇹🇭", "name": "flag Thailand", "slug": "flag_thailand" },
+ { "emoji": "🇹🇯", "name": "flag Tajikistan", "slug": "flag_tajikistan" },
+ { "emoji": "🇹🇰", "name": "flag Tokelau", "slug": "flag_tokelau" },
+ { "emoji": "🇹🇱", "name": "flag Timor-Leste", "slug": "flag_timor_leste" },
{
"emoji": "🇹🇲",
"name": "flag Turkmenistan",
"slug": "flag_turkmenistan"
},
- {
- "emoji": "🇹🇳",
- "name": "flag Tunisia",
- "slug": "flag_tunisia"
- },
- {
- "emoji": "🇹🇴",
- "name": "flag Tonga",
- "slug": "flag_tonga"
- },
- {
- "emoji": "🇹🇷",
- "name": "flag Turkey",
- "slug": "flag_turkey"
- },
+ { "emoji": "🇹🇳", "name": "flag Tunisia", "slug": "flag_tunisia" },
+ { "emoji": "🇹🇴", "name": "flag Tonga", "slug": "flag_tonga" },
+ { "emoji": "🇹🇷", "name": "flag Turkey", "slug": "flag_turkey" },
{
"emoji": "🇹🇹",
"name": "flag Trinidad & Tobago",
"slug": "flag_trinidad_tobago"
},
- {
- "emoji": "🇹🇻",
- "name": "flag Tuvalu",
- "slug": "flag_tuvalu"
- },
- {
- "emoji": "🇹🇼",
- "name": "flag Taiwan",
- "slug": "flag_taiwan"
- },
- {
- "emoji": "🇹🇿",
- "name": "flag Tanzania",
- "slug": "flag_tanzania"
- },
- {
- "emoji": "🇺🇦",
- "name": "flag Ukraine",
- "slug": "flag_ukraine"
- },
- {
- "emoji": "🇺🇬",
- "name": "flag Uganda",
- "slug": "flag_uganda"
- },
+ { "emoji": "🇹🇻", "name": "flag Tuvalu", "slug": "flag_tuvalu" },
+ { "emoji": "🇹🇼", "name": "flag Taiwan", "slug": "flag_taiwan" },
+ { "emoji": "🇹🇿", "name": "flag Tanzania", "slug": "flag_tanzania" },
+ { "emoji": "🇺🇦", "name": "flag Ukraine", "slug": "flag_ukraine" },
+ { "emoji": "🇺🇬", "name": "flag Uganda", "slug": "flag_uganda" },
{
"emoji": "🇺🇲",
"name": "flag U.S. Outlying Islands",
@@ -9186,16 +4170,8 @@
"name": "flag United States",
"slug": "flag_united_states"
},
- {
- "emoji": "🇺🇾",
- "name": "flag Uruguay",
- "slug": "flag_uruguay"
- },
- {
- "emoji": "🇺🇿",
- "name": "flag Uzbekistan",
- "slug": "flag_uzbekistan"
- },
+ { "emoji": "🇺🇾", "name": "flag Uruguay", "slug": "flag_uruguay" },
+ { "emoji": "🇺🇿", "name": "flag Uzbekistan", "slug": "flag_uzbekistan" },
{
"emoji": "🇻🇦",
"name": "flag Vatican City",
@@ -9206,11 +4182,7 @@
"name": "flag St. Vincent & Grenadines",
"slug": "flag_st_vincent_grenadines"
},
- {
- "emoji": "🇻🇪",
- "name": "flag Venezuela",
- "slug": "flag_venezuela"
- },
+ { "emoji": "🇻🇪", "name": "flag Venezuela", "slug": "flag_venezuela" },
{
"emoji": "🇻🇬",
"name": "flag British Virgin Islands",
@@ -9221,71 +4193,27 @@
"name": "flag U.S. Virgin Islands",
"slug": "flag_u_s_virgin_islands"
},
- {
- "emoji": "🇻🇳",
- "name": "flag Vietnam",
- "slug": "flag_vietnam"
- },
- {
- "emoji": "🇻🇺",
- "name": "flag Vanuatu",
- "slug": "flag_vanuatu"
- },
+ { "emoji": "🇻🇳", "name": "flag Vietnam", "slug": "flag_vietnam" },
+ { "emoji": "🇻🇺", "name": "flag Vanuatu", "slug": "flag_vanuatu" },
{
"emoji": "🇼🇫",
"name": "flag Wallis & Futuna",
"slug": "flag_wallis_futuna"
},
- {
- "emoji": "🇼🇸",
- "name": "flag Samoa",
- "slug": "flag_samoa"
- },
- {
- "emoji": "🇽🇰",
- "name": "flag Kosovo",
- "slug": "flag_kosovo"
- },
- {
- "emoji": "🇾🇪",
- "name": "flag Yemen",
- "slug": "flag_yemen"
- },
- {
- "emoji": "🇾🇹",
- "name": "flag Mayotte",
- "slug": "flag_mayotte"
- },
+ { "emoji": "🇼🇸", "name": "flag Samoa", "slug": "flag_samoa" },
+ { "emoji": "🇽🇰", "name": "flag Kosovo", "slug": "flag_kosovo" },
+ { "emoji": "🇾🇪", "name": "flag Yemen", "slug": "flag_yemen" },
+ { "emoji": "🇾🇹", "name": "flag Mayotte", "slug": "flag_mayotte" },
{
"emoji": "🇿🇦",
"name": "flag South Africa",
"slug": "flag_south_africa"
},
- {
- "emoji": "🇿🇲",
- "name": "flag Zambia",
- "slug": "flag_zambia"
- },
- {
- "emoji": "🇿🇼",
- "name": "flag Zimbabwe",
- "slug": "flag_zimbabwe"
- },
- {
- "emoji": "🏴",
- "name": "flag England",
- "slug": "flag_england"
- },
- {
- "emoji": "🏴",
- "name": "flag Scotland",
- "slug": "flag_scotland"
- },
- {
- "emoji": "🏴",
- "name": "flag Wales",
- "slug": "flag_wales"
- }
+ { "emoji": "🇿🇲", "name": "flag Zambia", "slug": "flag_zambia" },
+ { "emoji": "🇿🇼", "name": "flag Zimbabwe", "slug": "flag_zimbabwe" },
+ { "emoji": "🏴", "name": "flag England", "slug": "flag_england" },
+ { "emoji": "🏴", "name": "flag Scotland", "slug": "flag_scotland" },
+ { "emoji": "🏴", "name": "flag Wales", "slug": "flag_wales" }
]
}
]
diff --git a/app/javascript/widget/assets/scss/woot.scss b/app/javascript/widget/assets/scss/woot.scss
index c42273215..6d2ee7976 100755
--- a/app/javascript/widget/assets/scss/woot.scss
+++ b/app/javascript/widget/assets/scss/woot.scss
@@ -272,6 +272,9 @@ blockquote {
--gray-12: 32 32 32;
--background-color: 253 253 253;
+ --surface-1: 254 254 254;
+ --surface-2: 255 255 255;
+ --surface-active: 255 255 255;
--text-blue: 8 109 224;
--border-container: 236 236 236;
--border-strong: 235 235 235;
@@ -379,6 +382,9 @@ blockquote {
--gray-12: 238 238 238;
--background-color: 18 18 19;
+ --surface-1: 20 21 23;
+ --surface-2: 22 23 26;
+ --surface-active: 53 57 66;
--border-strong: 52 52 52;
--border-weak: 38 38 42;
--solid-1: 23 23 26;
diff --git a/app/javascript/widget/components/ChatInputWrap.vue b/app/javascript/widget/components/ChatInputWrap.vue
index a298237f3..9326b60d8 100755
--- a/app/javascript/widget/components/ChatInputWrap.vue
+++ b/app/javascript/widget/components/ChatInputWrap.vue
@@ -1,4 +1,5 @@
-
-
-
-
-
-
-
- - {{ selectedKey }} -
-
-
-
-
-
-
-
-
-
- - {{ category.name }} -
-
-
-
-
-
-
-
-
- {{ $t('EMOJI.NOT_FOUND') }}
-
-
+
-
- <% if category.icon.present? %><%= render_emoji_or_icon(category.icon, category.icon_color) %><% end %>
+ <% if category.icon.present? %><%= render_emoji_or_icon(category.icon, category.icon_color) %><% end %>
<%= category.name %>
<% end %>
diff --git a/spec/helpers/portal_helper_spec.rb b/spec/helpers/portal_helper_spec.rb
index 37c7a927c..96df64a05 100644
--- a/spec/helpers/portal_helper_spec.rb
+++ b/spec/helpers/portal_helper_spec.rb
@@ -23,35 +23,6 @@ describe PortalHelper do
end
end
- describe '#generate_portal_bg_color' do
- context 'when theme is dark' do
- it 'returns the correct color mix with black' do
- expect(helper.generate_portal_bg_color('#ff0000', 'dark')).to eq(
- 'color-mix(in srgb, #ff0000 20%, black)'
- )
- end
- end
-
- context 'when theme is not dark' do
- it 'returns the correct color mix with white' do
- expect(helper.generate_portal_bg_color('#ff0000', 'light')).to eq(
- 'color-mix(in srgb, #ff0000 20%, white)'
- )
- end
- end
-
- context 'when provided with various colors' do
- it 'adjusts the color mix appropriately' do
- expect(helper.generate_portal_bg_color('#00ff00', 'dark')).to eq(
- 'color-mix(in srgb, #00ff00 20%, black)'
- )
- expect(helper.generate_portal_bg_color('#0000ff', 'light')).to eq(
- 'color-mix(in srgb, #0000ff 20%, white)'
- )
- end
- end
- end
-
describe '#generate_portal_bg' do
context 'when theme is dark' do
it 'returns the correct background with dark grid image and color mix with black' do
From de137e8297c4ed19f405730318dc242fa7c03072 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth
Date: Tue, 16 Jun 2026 09:58:29 +0400
Subject: [PATCH 10/26] feat: Capture CTWA referral metadata for WhatsApp
conversations (#14681)
Adds support for capturing Click-to-WhatsApp ad referral metadata from
incoming WhatsApp messages.
This stores Meta Cloud API `referral` payloads on the incoming message
`content_attributes` and normalizes Twilio `Referral*` callback fields
into the same shape. The UI display is intentionally deferred until
Instagram, Messenger, and TikTok referral payloads are captured as well,
so we can design one cross-channel referral surface instead of a
WhatsApp-only sidebar block.
Why message-level storage
Meta sends CTWA referral details as part of the inbound message payload,
not as a stable conversation-level webhook. The referral represents the
exact ad click that produced that specific customer message, and later
messages in the same conversation may not carry the same context.
Storing the normalized referral on the message preserves the original
webhook semantics, avoids adding conversation-level attribution that
could become stale or ambiguous, and keeps support for both Cloud API
and Twilio payloads aligned behind `content_attributes.referral`.
Fixes
https://linear.app/chatwoot/issue/CW-7090/surface-meta-ctwa-referral-on-incoming-whatsapp-messages-cloud-api
Closes https://github.com/chatwoot/chatwoot/issues/13995,
https://github.com/chatwoot/chatwoot/issues/12560,
https://github.com/chatwoot/chatwoot/issues/13006
Related community PRs
- https://github.com/chatwoot/chatwoot/pull/13130
- https://github.com/chatwoot/chatwoot/pull/14180
- https://github.com/chatwoot/chatwoot/pull/14121
Related follow-ups
-
https://linear.app/chatwoot/issue/CW-7301/capture-instagram-ad-referral-metadata-on-incoming-messages
-
https://linear.app/chatwoot/issue/CW-7302/capture-messenger-ad-referral-metadata-on-facebook-page-conversations
-
https://linear.app/chatwoot/issue/CW-7303/capture-tiktok-ad-referral-metadata-from-im-referral-msg-events
How to test
1. Send or replay a WhatsApp Cloud API inbound message that contains a
`messages[0].referral` payload from a Click-to-WhatsApp ad.
2. Confirm the generated incoming message stores the payload under
`content_attributes.referral`.
3. Repeat with a Twilio WhatsApp callback containing `Referral*` fields
and confirm the stored message has the same normalized
`content_attributes.referral` structure.
---------
Co-authored-by: Muhsin <12408980+muhsin-k@users.noreply.github.com>
---
app/controllers/twilio/callback_controller.rb | 12 ++-
.../twilio/incoming_message_service.rb | 4 +-
app/services/twilio/referral_params_helper.rb | 28 +++++++
.../whatsapp/incoming_message_base_service.rb | 17 ++--
.../incoming_message_service_helpers.rb | 6 ++
.../twilio/callbacks_controller_spec.rb | 10 ++-
.../twilio/incoming_message_service_spec.rb | 54 ++++++++++++
...ing_message_whatsapp_cloud_service_spec.rb | 82 +++++++++++++++++++
8 files changed, 204 insertions(+), 9 deletions(-)
create mode 100644 app/services/twilio/referral_params_helper.rb
diff --git a/app/controllers/twilio/callback_controller.rb b/app/controllers/twilio/callback_controller.rb
index 53075a555..ed1a05376 100644
--- a/app/controllers/twilio/callback_controller.rb
+++ b/app/controllers/twilio/callback_controller.rb
@@ -35,7 +35,17 @@ class Twilio::CallbackController < ApplicationController
:ExternalUserId,
:ParentExternalUserId,
:ProfileUsername,
- :Username
+ :Username,
+ :ReferralBody,
+ :ReferralHeadline,
+ :ReferralSourceId,
+ :ReferralSourceType,
+ :ReferralSourceUrl,
+ :ReferralMediaId,
+ :ReferralMediaContentType,
+ :ReferralMediaUrl,
+ :ReferralNumMedia,
+ :ReferralCtwaClid
)
end
end
diff --git a/app/services/twilio/incoming_message_service.rb b/app/services/twilio/incoming_message_service.rb
index dab55e521..02a1636ed 100644
--- a/app/services/twilio/incoming_message_service.rb
+++ b/app/services/twilio/incoming_message_service.rb
@@ -1,6 +1,7 @@
class Twilio::IncomingMessageService
include ::FileTypeHelper
include ::Twilio::WhatsappIdentifierHelper
+ include ::Twilio::ReferralParamsHelper
pattr_initialize [:params!]
@@ -15,7 +16,8 @@ class Twilio::IncomingMessageService
inbox_id: @inbox.id,
message_type: :incoming,
sender: @contact,
- source_id: params[:SmsSid]
+ source_id: params[:SmsSid],
+ content_attributes: message_content_attributes
)
attach_files
attach_location if location_message?
diff --git a/app/services/twilio/referral_params_helper.rb b/app/services/twilio/referral_params_helper.rb
new file mode 100644
index 000000000..0bc032dbb
--- /dev/null
+++ b/app/services/twilio/referral_params_helper.rb
@@ -0,0 +1,28 @@
+module Twilio::ReferralParamsHelper
+ REFERRAL_PARAM_MAPPING = {
+ source_id: :ReferralSourceId,
+ source_type: :ReferralSourceType,
+ source_url: :ReferralSourceUrl,
+ headline: :ReferralHeadline,
+ body: :ReferralBody,
+ media_id: :ReferralMediaId,
+ media_content_type: :ReferralMediaContentType,
+ media_url: :ReferralMediaUrl,
+ num_media: :ReferralNumMedia,
+ ctwa_clid: :ReferralCtwaClid
+ }.freeze
+
+ def message_content_attributes
+ referral_attributes.present? ? { referral: referral_attributes } : {}
+ end
+
+ def referral_attributes
+ return {} unless twilio_channel.whatsapp?
+ return {} if params[:ReferralSourceId].blank?
+
+ REFERRAL_PARAM_MAPPING.each_with_object({}) do |(attribute, param_key), result|
+ value = params[param_key]
+ result[attribute] = value if value.present?
+ end
+ end
+end
diff --git a/app/services/whatsapp/incoming_message_base_service.rb b/app/services/whatsapp/incoming_message_base_service.rb
index 9e0720f74..00936ff15 100644
--- a/app/services/whatsapp/incoming_message_base_service.rb
+++ b/app/services/whatsapp/incoming_message_base_service.rb
@@ -91,7 +91,7 @@ class Whatsapp::IncomingMessageBaseService
def create_contact_messages(message)
message['contacts'].each do |contact|
# Pass source_id from parent message since contact objects don't have :id
- create_message(contact, source_id: message[:id])
+ create_message(contact, source_id: message[:id], content_attributes_source: message)
attach_contact(contact)
@message.save!
end
@@ -158,10 +158,7 @@ class Whatsapp::IncomingMessageBaseService
)
end
- def create_message(message, source_id: nil)
- content_attrs = outgoing_echo ? { external_echo: true } : {}
- content_attrs[:in_reply_to_external_id] = @in_reply_to_external_id if @in_reply_to_external_id.present?
-
+ def create_message(message, source_id: nil, content_attributes_source: message)
@message = @conversation.messages.build(
content: message_content(message),
account_id: @inbox.account_id,
@@ -171,10 +168,18 @@ class Whatsapp::IncomingMessageBaseService
status: outgoing_echo ? :delivered : :sent,
sender: outgoing_echo ? nil : @contact,
source_id: (source_id || message[:id]).to_s,
- content_attributes: content_attrs
+ content_attributes: message_content_attributes(content_attributes_source)
)
end
+ def message_content_attributes(message)
+ content_attrs = outgoing_echo ? { external_echo: true } : {}
+ content_attrs[:in_reply_to_external_id] = @in_reply_to_external_id if @in_reply_to_external_id.present?
+ referral_content_attrs = referral_attributes(message)
+ content_attrs[:referral] = referral_content_attrs if referral_content_attrs.present?
+ content_attrs
+ end
+
def attach_contact(contact)
phones = contact[:phones]
phones = [{ phone: 'Phone number is not available' }] if phones.blank?
diff --git a/app/services/whatsapp/incoming_message_service_helpers.rb b/app/services/whatsapp/incoming_message_service_helpers.rb
index 27a854479..fd0d44cbe 100644
--- a/app/services/whatsapp/incoming_message_service_helpers.rb
+++ b/app/services/whatsapp/incoming_message_service_helpers.rb
@@ -71,6 +71,12 @@ module Whatsapp::IncomingMessageServiceHelpers
@in_reply_to_external_id = message['context']&.[]('id')
end
+ def referral_attributes(message)
+ return {} if outgoing_echo
+
+ message[:referral]&.to_h&.deep_stringify_keys || {}
+ end
+
def find_message_by_source_id(source_id)
return unless source_id
diff --git a/spec/controllers/twilio/callbacks_controller_spec.rb b/spec/controllers/twilio/callbacks_controller_spec.rb
index 1dc2991ae..3a4ef16c1 100644
--- a/spec/controllers/twilio/callbacks_controller_spec.rb
+++ b/spec/controllers/twilio/callbacks_controller_spec.rb
@@ -13,7 +13,15 @@ RSpec.describe 'Twilio::CallbacksController', type: :request do
'SmsSid' => 'SM123',
'ExternalUserId' => 'IN.2081978709342942',
'ParentExternalUserId' => 'IN.ENT.9081726354',
- 'ProfileUsername' => 'muhsin'
+ 'ProfileUsername' => 'muhsin',
+ 'ReferralCtwaClid' => 'AfjyUDlaIoiweZDnlzmDTEaG',
+ 'ReferralSourceId' => '120237244350960485',
+ 'ReferralSourceUrl' => 'https://fb.me/4tBfhWhjr',
+ 'ReferralSourceType' => 'ad',
+ 'ReferralHeadline' => 'German citizenship lawyer',
+ 'ReferralBody' => 'Fast-track your German citizenship',
+ 'ReferralMediaId' => '',
+ 'ReferralNumMedia' => '0'
}
end
diff --git a/spec/services/twilio/incoming_message_service_spec.rb b/spec/services/twilio/incoming_message_service_spec.rb
index d50a0113d..dc30f6e62 100644
--- a/spec/services/twilio/incoming_message_service_spec.rb
+++ b/spec/services/twilio/incoming_message_service_spec.rb
@@ -511,6 +511,60 @@ describe Twilio::IncomingMessageService do
end
end
+ describe 'When the incoming WhatsApp message has CTWA referral parameters' do
+ let!(:whatsapp_twilio_channel) do
+ create(:channel_twilio_sms, :whatsapp, account: account, account_sid: 'ACxxx',
+ inbox: create(:inbox, account: account, greeting_enabled: false))
+ end
+
+ it 'stores normalized referral attributes on the message' do
+ params = {
+ SmsSid: 'SMxx',
+ From: 'whatsapp:+491741763110',
+ AccountSid: 'ACxxx',
+ MessagingServiceSid: whatsapp_twilio_channel.messaging_service_sid,
+ Body: 'Hallo! Kann ich hierzu mehr Informationen erhalten?',
+ ReferralCtwaClid: 'AfjyUDlaIoiweZDnlzmDTEaG',
+ ReferralSourceId: '120237244350960485',
+ ReferralSourceUrl: 'https://fb.me/4tBfhWhjr',
+ ReferralSourceType: 'ad',
+ ReferralHeadline: 'German citizenship lawyer',
+ ReferralBody: 'Fast-track your German citizenship',
+ ReferralMediaId: '',
+ ReferralNumMedia: '0'
+ }
+
+ described_class.new(params: params).perform
+
+ message = whatsapp_twilio_channel.inbox.messages.last
+ expect(message.content_attributes['referral']).to eq(
+ 'ctwa_clid' => 'AfjyUDlaIoiweZDnlzmDTEaG',
+ 'source_id' => '120237244350960485',
+ 'source_url' => 'https://fb.me/4tBfhWhjr',
+ 'source_type' => 'ad',
+ 'headline' => 'German citizenship lawyer',
+ 'body' => 'Fast-track your German citizenship',
+ 'num_media' => '0'
+ )
+ end
+
+ it 'does not add referral attributes when ReferralSourceId is absent' do
+ params = {
+ SmsSid: 'SMxx',
+ From: 'whatsapp:+491741763110',
+ AccountSid: 'ACxxx',
+ MessagingServiceSid: whatsapp_twilio_channel.messaging_service_sid,
+ Body: 'Regular WhatsApp message',
+ ReferralCtwaClid: 'AfjyUDlaIoiweZDnlzmDTEaG'
+ }
+
+ described_class.new(params: params).perform
+
+ message = whatsapp_twilio_channel.inbox.messages.last
+ expect(message.content_attributes).not_to have_key('referral')
+ end
+ end
+
describe 'When the incoming number is a Brazilian number in new format with 9 included' do
let!(:whatsapp_twilio_channel) do
create(:channel_twilio_sms, :whatsapp, account: account, account_sid: 'ACxxx',
diff --git a/spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb b/spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb
index 1bbd6d8f4..60b153775 100644
--- a/spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_whatsapp_cloud_service_spec.rb
@@ -234,6 +234,88 @@ describe Whatsapp::IncomingMessageWhatsappCloudService do
end
end
+ context 'when message contains referral data' do
+ let(:referral_params) do
+ {
+ phone_number: whatsapp_channel.phone_number,
+ object: 'whatsapp_business_account',
+ entry: [{
+ changes: [{
+ value: {
+ contacts: [{ profile: { name: 'Mom' }, wa_id: '255718573302', user_id: 'TZ.1040042605869930' }],
+ messages: [{
+ referral: {
+ source_url: 'https://fb.me/3TYpooaRT',
+ source_id: '52558118838064',
+ source_type: 'ad',
+ body: 'washa data tu',
+ headline: 'Diana Digital',
+ media_type: 'video',
+ video_url: 'https://www.facebook.com/reel/1438165771395493/',
+ thumbnail_url: 'https://scontent.xx.fbcdn.net/sample.jpg',
+ ctwa_clid: 'AfhcQdP2E4A8wWpeb1FqUzUi',
+ welcome_message: {
+ text: 'Hi! Please let us know how we can help you.'
+ }
+ },
+ from: '255718573302',
+ from_user_id: 'TZ.1040042605869930',
+ id: 'wamid.CTWA_REFERRAL_MESSAGE',
+ timestamp: '1780649766',
+ text: { body: 'Hello nielekeze' },
+ type: 'text'
+ }]
+ }
+ }]
+ }]
+ }.with_indifferent_access
+ end
+
+ it 'stores the referral payload in message content attributes' do
+ described_class.new(inbox: whatsapp_channel.inbox, params: referral_params).perform
+
+ message = whatsapp_channel.inbox.messages.last
+ expect(message.content).to eq('Hello nielekeze')
+ expect(message.content_attributes['referral']).to include(
+ 'source_url' => 'https://fb.me/3TYpooaRT',
+ 'source_id' => '52558118838064',
+ 'source_type' => 'ad',
+ 'body' => 'washa data tu',
+ 'headline' => 'Diana Digital',
+ 'media_type' => 'video',
+ 'video_url' => 'https://www.facebook.com/reel/1438165771395493/',
+ 'thumbnail_url' => 'https://scontent.xx.fbcdn.net/sample.jpg',
+ 'ctwa_clid' => 'AfhcQdP2E4A8wWpeb1FqUzUi',
+ 'welcome_message' => { 'text' => 'Hi! Please let us know how we can help you.' }
+ )
+ end
+
+ it 'preserves the referral payload when the message contains contacts' do
+ contacts_referral_params = referral_params.deep_dup
+ parent_message = contacts_referral_params.dig(:entry, 0, :changes, 0, :value, :messages, 0)
+ parent_message[:type] = 'contacts'
+ parent_message.delete(:text)
+ parent_message[:contacts] = [{
+ name: {
+ formatted_name: 'Diana Digital',
+ first_name: 'Diana',
+ last_name: 'Digital'
+ },
+ phones: [{ phone: '+255718573302' }]
+ }]
+
+ described_class.new(inbox: whatsapp_channel.inbox, params: contacts_referral_params).perform
+
+ message = whatsapp_channel.inbox.messages.last
+ expect(message.content).to eq('Diana Digital')
+ expect(message.content_attributes['referral']).to include(
+ 'source_id' => '52558118838064',
+ 'headline' => 'Diana Digital',
+ 'ctwa_clid' => 'AfhcQdP2E4A8wWpeb1FqUzUi'
+ )
+ end
+ end
+
context 'when message is a reply (has context)' do
let(:reply_params) do
{
From 41a3ab6dfa39a0af06e110aeef0ba84628fe64de Mon Sep 17 00:00:00 2001
From: Sojan Jose
Date: Tue, 16 Jun 2026 15:29:27 +0530
Subject: [PATCH 11/26] feat(companies): add contact company selector (#14496)
Adds a company selector to the contact details form so agents can
associate a contact with an existing company directly from the contact
page.
Closes
- None
Why
Contacts already expose company information through the CRM fields, but
the form only accepted free-text company names. As we split company CRM
work into smaller PRs, this keeps the contact page aligned with the
structured company model while preserving the existing company-name
behavior used by automations.
What changed
- Shows a company dropdown in the contact details form when the
Companies feature is enabled.
- Keeps legacy free-text company names editable when a contact has no
structured `company_id`.
- Allows Enterprise contact create/update APIs to accept account-scoped
`company_id`.
- Syncs `additional_attributes.company_name` when a contact is
associated with a company, including the existing email-domain
auto-association path.
- Serializes `company_id` in the contact model payload so the form can
show the current association.
How to test
1. Enable Companies for an account and open a contact details page.
2. In Edit contact details, use the Company field to select an existing
company.
3. Save the contact and refresh the page.
4. Confirm the selected company remains visible and the contact is
associated with that company.
5. Confirm contacts with only a legacy free-text company name still show
the text input instead of an empty selector.
---------
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: iamsivin
Co-authored-by: Sony Mathew <2040199+sony-mathew@users.noreply.github.com>
---
.../api/v1/accounts/contacts_controller.rb | 2 +
.../Companies/CompanyCreateDialog.vue | 9 +-
.../Companies/CompanySelector.vue | 153 ++++++++++++++++++
.../Contacts/ContactsCard/ContactsCard.vue | 2 +
.../Contacts/ContactsForm/ContactsForm.vue | 43 ++++-
.../Contacts/Pages/ContactsList.vue | 1 +
.../components-next/combobox/ComboBox.vue | 8 +-
.../combobox/ComboBoxDropdown.vue | 2 +-
.../dashboard/i18n/locale/en/companies.json | 4 +
.../companies/pages/CompaniesIndex.vue | 2 +-
.../store/modules/contacts/actions.js | 8 +-
.../modules/specs/contacts/actions.spec.js | 27 ++++
app/models/contact.rb | 4 +-
.../api/v1/models/_contact.json.jbuilder | 1 +
.../api/v1/accounts/contacts_controller.rb | 17 ++
.../app/models/enterprise/concerns/contact.rb | 11 ++
.../contacts/company_association_service.rb | 6 +-
.../v1/accounts/contacts_controller_spec.rb | 6 +-
.../companies/contacts_controller_spec.rb | 28 +++-
.../v1/accounts/contacts_controller_spec.rb | 24 +++
.../contact_company_association_spec.rb | 16 ++
.../company_association_service_spec.rb | 1 +
spec/jobs/slack_unfurl_job_spec.rb | 4 +-
23 files changed, 355 insertions(+), 24 deletions(-)
create mode 100644 app/javascript/dashboard/components-next/Companies/CompanySelector.vue
create mode 100644 enterprise/app/controllers/enterprise/api/v1/accounts/contacts_controller.rb
create mode 100644 spec/enterprise/controllers/api/v1/accounts/contacts_controller_spec.rb
diff --git a/app/controllers/api/v1/accounts/contacts_controller.rb b/app/controllers/api/v1/accounts/contacts_controller.rb
index eafda0fe2..bc1082583 100644
--- a/app/controllers/api/v1/accounts/contacts_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts_controller.rb
@@ -214,3 +214,5 @@ class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
render json: error, status: error_status
end
end
+
+Api::V1::Accounts::ContactsController.prepend_mod_with('Api::V1::Accounts::ContactsController')
diff --git a/app/javascript/dashboard/components-next/Companies/CompanyCreateDialog.vue b/app/javascript/dashboard/components-next/Companies/CompanyCreateDialog.vue
index b3847030b..4b9d0b466 100644
--- a/app/javascript/dashboard/components-next/Companies/CompanyCreateDialog.vue
+++ b/app/javascript/dashboard/components-next/Companies/CompanyCreateDialog.vue
@@ -26,6 +26,13 @@ const resetForm = () => {
form.description = '';
};
+const open = (company = {}) => {
+ form.name = company.name || '';
+ form.domain = company.domain || '';
+ form.description = company.description || '';
+ dialogRef.value?.open();
+};
+
const handleConfirm = () => {
if (isFormInvalid.value) return;
@@ -45,7 +52,7 @@ const onSuccess = () => {
closeDialog();
};
-defineExpose({ dialogRef, onSuccess });
+defineExpose({ dialogRef, onSuccess, open });
diff --git a/app/javascript/dashboard/components-next/Companies/CompanySelector.vue b/app/javascript/dashboard/components-next/Companies/CompanySelector.vue
new file mode 100644
index 000000000..f8cfc8058
--- /dev/null
+++ b/app/javascript/dashboard/components-next/Companies/CompanySelector.vue
@@ -0,0 +1,153 @@
+
+
+
+
Date: Tue, 16 Jun 2026 18:56:30 +0530
Subject: [PATCH 12/26] feat: scale email rate limits by agent count for paid
plans (#13966)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Paid plan accounts with many agents were hitting the flat daily email
rate limit cap.
This multiplies the plan base limit by the account's agent seat count,
so larger teams
get proportionally higher limits. Free/hacker plan keeps the flat limit
unchanged.
Fixes https://linear.app/chatwoot/issue/CW-6664
## How to test
1. Set up `ACCOUNT_EMAILS_PLAN_LIMITS` config with plan limits (e.g.,
`{"hacker": 10, "startups": 20, "business": 30, "enterprise": 40}`)
2. Create an account on a paid plan (e.g., startups) with multiple agent
seats
3. Verify `account.email_rate_limit` returns `base_limit × agent_seats`
(e.g., 20 × 5 = 100)
4. Create an account on the hacker plan — verify limit stays flat (10)
5. Set a per-account override via super admin `limits.emails` — verify
it takes priority over the multiplied limit
## What changed
- `plan_email_limit` now multiplies the base plan limit by agent seat
count for paid plans
- Added `free_plan?` helper to skip the multiplier for the default/free
plan
---
.../enterprise/account/plan_usage_and_limits.rb | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb b/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb
index 0937c7b82..9b5093507 100644
--- a/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb
+++ b/enterprise/app/models/enterprise/account/plan_usage_and_limits.rb
@@ -75,6 +75,14 @@ module Enterprise::Account::PlanUsageAndLimits # rubocop:disable Metrics/ModuleL
end
def plan_email_limit
+ base_limit = plan_base_email_limit
+ return nil if base_limit.nil?
+ return base_limit if free_plan?
+
+ base_limit * [agent_limits.to_i, 1].max
+ end
+
+ def plan_base_email_limit
config = InstallationConfig.find_by(name: 'ACCOUNT_EMAILS_PLAN_LIMITS')&.value
return nil if config.blank? || plan_name.blank?
@@ -84,6 +92,11 @@ module Enterprise::Account::PlanUsageAndLimits # rubocop:disable Metrics/ModuleL
nil
end
+ def free_plan?
+ default_plan = InstallationConfig.find_by(name: 'CHATWOOT_CLOUD_PLANS')&.value&.first
+ default_plan.present? && plan_name&.downcase == default_plan['name']&.downcase
+ end
+
def default_captain_limits
max_limits = { documents: ChatwootApp.max_limit, responses: ChatwootApp.max_limit }.with_indifferent_access
zero_limits = { documents: 0, responses: 0 }.with_indifferent_access
From 64b0ebd8dc082fad4fe06cb14da9c5dd72f23b28 Mon Sep 17 00:00:00 2001
From: Francisco Brito <90341639+FranciscoJBrito@users.noreply.github.com>
Date: Tue, 16 Jun 2026 10:42:49 -0300
Subject: [PATCH 13/26] feat: Script to migrate images between providers
(#9117)
# Pull Request Template
## Description
Storage migration functionality, which allows the transfer of images
from one on-premises provider to another (e.g. AWS, Google, etc.) using
Active Storage.
I ran the unit and integration tests and they all passed correctly.
**The command to execute the migration is `FROM=from_service
TO=to_service rake storage:migrate`**
Fixes #7907
## Type of change
Please delete options that are not relevant.
- [x] New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
I have tested the storage migration functionality by running the
provided unit and integration tests. Additionally, I manually tested the
migration process in a local development environment by following these
steps:
Set up two storage services (e.g., AWS S3 and Google Cloud Storage) with
valid configurations.
Execute the `FROM=local TO=amazon rake storage:migrate` task with
appropriate FROM and TO arguments to migrate blobs between the services.
Verified that the blobs were successfully transferred to the target
storage service.
Checked for any error messages or unexpected behavior during the
migration process.
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [x] I have commented on my code, particularly in hard-to-understand
areas
- [x] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [x] Any dependent changes have been merged and published in downstream
modules
---------
Co-authored-by: Sony Mathew
Co-authored-by: Sony Mathew <2040199+sony-mathew@users.noreply.github.com>
---
lib/active_storage/migrator.rb | 52 ++++++
lib/tasks/storage_migrations.rake | 13 ++
spec/lib/active_storage/migrator_spec.rb | 175 ++++++++++++++++++
.../rake/task_storage_migrations_spec.rb | 64 +++++++
spec/rails_helper.rb | 4 +
5 files changed, 308 insertions(+)
create mode 100644 lib/active_storage/migrator.rb
create mode 100644 lib/tasks/storage_migrations.rake
create mode 100644 spec/lib/active_storage/migrator_spec.rb
create mode 100644 spec/lib/tasks/rake/task_storage_migrations_spec.rb
diff --git a/lib/active_storage/migrator.rb b/lib/active_storage/migrator.rb
new file mode 100644
index 000000000..0fdf1669d
--- /dev/null
+++ b/lib/active_storage/migrator.rb
@@ -0,0 +1,52 @@
+require 'yaml'
+require 'erb'
+
+class ActiveStorage::Migrator
+ def self.migrate(from_service_name, to_service_name, should_update_service_name: true)
+ configs = load_storage_config
+ # Check if services are configured correctly
+ if configs[from_service_name.to_s].nil? || configs[to_service_name.to_s].nil?
+ raise "Error: The services '#{from_service_name}' or '#{to_service_name}' are not configured correctly."
+ end
+
+ from_service = configure_service(from_service_name, configs)
+
+ configure_blob_service(from_service)
+
+ migrate_blobs(from_service_name, to_service_name, should_update_service_name: should_update_service_name)
+ end
+
+ def self.load_storage_config
+ yaml_with_env = ERB.new(File.read('config/storage.yml')).result
+ YAML.load(yaml_with_env)
+ end
+
+ def self.configure_blob_service(service)
+ ActiveStorage::Blob.service = service
+ end
+
+ def self.configure_service(service_name, configs = load_storage_config)
+ service_config = configs[service_name.to_s]
+ ActiveStorage::Service.configure(service_name, { service_name.to_sym => service_config })
+ end
+
+ def self.migrate_blobs(from_service_name, to_service_name, should_update_service_name: true)
+ to_service = configure_service(to_service_name)
+ blobs = ActiveStorage::Blob.where(service_name: from_service_name.to_s)
+ Rails.logger.debug { "#{blobs.count} Blobs to migrate from #{from_service_name} to #{to_service_name}" }
+
+ blobs.find_each do |blob|
+ Rails.logger.debug { '.' }
+
+ blob.open do |io|
+ checksum = blob.checksum
+ to_service.upload(blob.key, io, checksum: checksum)
+ end
+
+ blob.update!(service_name: to_service_name.to_s) if should_update_service_name
+ rescue ActiveStorage::FileNotFoundError => e
+ Rails.logger.warn { "Skipping missing blob #{blob.id} (#{blob.key}): #{e.message}" }
+ end
+ Rails.logger.debug { 'Successful migration' }
+ end
+end
diff --git a/lib/tasks/storage_migrations.rake b/lib/tasks/storage_migrations.rake
new file mode 100644
index 000000000..9a864db4e
--- /dev/null
+++ b/lib/tasks/storage_migrations.rake
@@ -0,0 +1,13 @@
+namespace :storage do
+ desc 'Migrate blobs from one storage service to another'
+ # Example: FROM=local TO=amazon UPDATE_BLOB_SERVICE_NAME=true bundle exec rake storage:migrate
+ task migrate: :environment do
+ from_service = ENV.fetch('FROM', nil)
+ to_service = ENV.fetch('TO', nil)
+ should_update_service_name = ActiveModel::Type::Boolean.new.cast(ENV.fetch('UPDATE_BLOB_SERVICE_NAME', true))
+
+ raise 'Missing FROM or TO argument. Usage: FROM=service_name TO=service_name rake storage:migrate' if from_service.nil? || to_service.nil?
+
+ ActiveStorage::Migrator.migrate(from_service.to_sym, to_service.to_sym, should_update_service_name: should_update_service_name)
+ end
+end
diff --git a/spec/lib/active_storage/migrator_spec.rb b/spec/lib/active_storage/migrator_spec.rb
new file mode 100644
index 000000000..748e18174
--- /dev/null
+++ b/spec/lib/active_storage/migrator_spec.rb
@@ -0,0 +1,175 @@
+require 'rails_helper'
+require 'fileutils'
+require 'stringio'
+require 'tmpdir'
+
+RSpec.describe ActiveStorage::Migrator do
+ around do |example|
+ original_services = ActiveStorage::Blob.services
+ original_service = ActiveStorage::Blob.service
+
+ example.run
+ ensure
+ ActiveStorage::Blob.services = original_services
+ ActiveStorage::Blob.service = original_service
+ end
+
+ describe '.migrate' do
+ let(:from_service_stub) { instance_double(ActiveStorage::Service, name: 'local') }
+ let(:to_service_stub) { instance_double(ActiveStorage::Service, name: 'amazon') }
+
+ before do
+ allow(ActiveStorage::Service).to receive(:configure).with('local', any_args).and_return(from_service_stub)
+ allow(ActiveStorage::Service).to receive(:configure).with('amazon', any_args).and_return(to_service_stub)
+ end
+
+ context 'when services are configured correctly' do
+ it 'migrates blobs from one service to another' do
+ expect(ActiveStorage::Service).to receive(:configure).with('local', any_args)
+ expect(described_class).to receive(:migrate_blobs).with('local', 'amazon', should_update_service_name: true)
+ expect { described_class.migrate('local', 'amazon') }.not_to raise_error
+ end
+
+ it 'passes the service-name update flag to blob migration' do
+ expect(described_class).to receive(:migrate_blobs).with('local', 'amazon', should_update_service_name: false)
+
+ described_class.migrate('local', 'amazon', should_update_service_name: false)
+ end
+
+ it 'does not override the application logger' do
+ allow(described_class).to receive(:migrate_blobs)
+
+ expect(Rails).not_to receive(:logger=)
+
+ described_class.migrate('local', 'amazon')
+ end
+ end
+
+ context 'when services are not configured correctly' do
+ it 'prints an error message' do
+ allow(ActiveStorage::Service).to receive(:configure).and_return(nil)
+ expect do
+ described_class.migrate('random', 'random')
+ end.to raise_error(RuntimeError, "Error: The services 'random' or 'random' are not configured correctly.")
+ end
+ end
+ end
+
+ describe '.migrate_blobs' do
+ let(:from_root) { Dir.mktmpdir('active-storage-local') }
+ let(:to_root) { Dir.mktmpdir('active-storage-amazon') }
+ let(:other_root) { Dir.mktmpdir('active-storage-other') }
+ let(:from_service) { build_disk_service('local', from_root) }
+ let(:to_service) { build_disk_service('amazon', to_root) }
+ let(:other_service) { build_disk_service('other', other_root) }
+
+ before do
+ allow(described_class).to receive(:configure_service).with(:amazon).and_return(to_service)
+ end
+
+ around do |example|
+ original_services = ActiveStorage::Blob.services
+ original_service = ActiveStorage::Blob.service
+
+ ActiveStorage::Blob.services = {
+ 'local' => from_service,
+ 'amazon' => to_service,
+ 'other' => other_service
+ }
+ ActiveStorage::Blob.service = from_service
+
+ example.run
+ ensure
+ ActiveStorage::Blob.services = original_services
+ ActiveStorage::Blob.service = original_service
+ FileUtils.rm_rf([from_root, to_root, other_root])
+ end
+
+ it 'uploads non-image blobs and updates their service name' do
+ blob = create_blob(service_name: 'local', filename: 'invoice.pdf', content_type: 'application/pdf', content: 'pdf-content')
+
+ described_class.migrate_blobs(:local, :amazon, should_update_service_name: true)
+
+ expect(blob).not_to be_image
+ expect(blob.reload.service_name).to eq('amazon')
+ expect(to_service.download(blob.key)).to eq('pdf-content')
+ end
+
+ it 'only migrates blobs from the source service' do
+ local_blob = create_blob(service_name: 'local', filename: 'audio.mp3', content_type: 'audio/mpeg', content: 'audio-content')
+ other_blob = create_blob(service_name: 'other', filename: 'other.pdf', content_type: 'application/pdf', content: 'other-content')
+
+ described_class.migrate_blobs(:local, :amazon, should_update_service_name: true)
+
+ expect(local_blob.reload.service_name).to eq('amazon')
+ expect(to_service.download(local_blob.key)).to eq('audio-content')
+ expect(other_blob.reload.service_name).to eq('other')
+ expect(to_service.exist?(other_blob.key)).to be(false)
+ expect(other_service.download(other_blob.key)).to eq('other-content')
+ end
+
+ it 'skips missing source files and continues migration' do
+ missing_blob = create_blob(service_name: 'local', filename: 'missing.pdf', content_type: 'application/pdf', content: 'missing-content')
+ existing_blob = create_blob(service_name: 'local', filename: 'existing.pdf', content_type: 'application/pdf', content: 'existing-content')
+
+ from_service.delete(missing_blob.key)
+
+ expect do
+ described_class.migrate_blobs(:local, :amazon, should_update_service_name: true)
+ end.not_to raise_error
+
+ expect(missing_blob.reload.service_name).to eq('local')
+ expect(to_service.exist?(missing_blob.key)).to be(false)
+ expect(existing_blob.reload.service_name).to eq('amazon')
+ expect(to_service.download(existing_blob.key)).to eq('existing-content')
+ end
+
+ it 'does not update the blob service when upload fails' do
+ blob = create_blob(service_name: 'local', filename: 'report.pdf', content_type: 'application/pdf', content: 'report-content')
+
+ allow(to_service).to receive(:upload).and_raise(ActiveStorage::IntegrityError)
+
+ expect do
+ described_class.migrate_blobs(:local, :amazon, should_update_service_name: true)
+ end.to raise_error(ActiveStorage::IntegrityError)
+
+ expect(blob.reload.service_name).to eq('local')
+ expect(to_service.exist?(blob.key)).to be(false)
+ end
+
+ it 'skips the blob service update when the flag is disabled' do
+ blob = create_blob(service_name: 'local', filename: 'manual.pdf', content_type: 'application/pdf', content: 'manual-content')
+
+ described_class.migrate_blobs(:local, :amazon, should_update_service_name: false)
+
+ expect(blob.reload.service_name).to eq('local')
+ expect(to_service.download(blob.key)).to eq('manual-content')
+ end
+
+ it 'does not rewrite blobs that were already migrated' do
+ blob = create_blob(service_name: 'local', filename: 'archive.pdf', content_type: 'application/pdf', content: 'archive-content')
+
+ allow(to_service).to receive(:upload).and_call_original
+
+ 2.times { described_class.migrate_blobs(:local, :amazon, should_update_service_name: true) }
+
+ expect(to_service).to have_received(:upload).with(blob.key, an_instance_of(Tempfile), checksum: blob.checksum).once
+ expect(blob.reload.service_name).to eq('amazon')
+ expect(ActiveStorage::Blob.where(id: blob.id, service_name: 'local')).to be_empty
+ end
+
+ def build_disk_service(service_name, root)
+ ActiveStorage::Service.configure(service_name, { service_name => { service: 'Disk', root: root } })
+ end
+
+ def create_blob(service_name:, filename:, content_type:, content:)
+ ActiveStorage::Blob.create_and_upload!(
+ io: StringIO.new(content),
+ filename: filename,
+ content_type: content_type,
+ service_name: service_name,
+ identify: false
+ )
+ end
+ end
+end
diff --git a/spec/lib/tasks/rake/task_storage_migrations_spec.rb b/spec/lib/tasks/rake/task_storage_migrations_spec.rb
new file mode 100644
index 000000000..552c814b3
--- /dev/null
+++ b/spec/lib/tasks/rake/task_storage_migrations_spec.rb
@@ -0,0 +1,64 @@
+require 'rake'
+require 'rails_helper'
+
+RSpec.describe Rake::Task do
+ describe 'storage_migrations' do
+ describe 'rake task' do
+ subject(:task) { described_class['storage:migrate'] }
+
+ before do
+ task.reenable
+ end
+
+ context 'when FROM argument is missing' do
+ it 'raises an error' do
+ with_modified_env FROM: nil, TO: 'amazon' do
+ expect do
+ task.invoke
+ end.to raise_error(RuntimeError,
+ 'Missing FROM or TO argument. Usage: FROM=service_name TO=service_name rake storage:migrate')
+ end
+ end
+ end
+
+ context 'when TO argument is missing' do
+ it 'raises an error' do
+ with_modified_env FROM: 'service_name', TO: nil do
+ expect do
+ task.invoke
+ end.to raise_error(RuntimeError,
+ 'Missing FROM or TO argument. Usage: FROM=service_name TO=service_name rake storage:migrate')
+ end
+ end
+ end
+
+ context 'when required arguments are present' do
+ it 'updates blob service names by default' do
+ expect(ActiveStorage::Migrator).to receive(:migrate).with(:local, :amazon, should_update_service_name: true)
+
+ with_modified_env FROM: 'local', TO: 'amazon', UPDATE_BLOB_SERVICE_NAME: nil do
+ task.invoke
+ end
+ end
+
+ it 'skips updating blob service names when disabled' do
+ expect(ActiveStorage::Migrator).to receive(:migrate).with(:local, :amazon, should_update_service_name: false)
+
+ with_modified_env FROM: 'local', TO: 'amazon', UPDATE_BLOB_SERVICE_NAME: 'false' do
+ task.invoke
+ end
+ end
+
+ it 'can be invoked again after the task is re-enabled' do
+ expect(ActiveStorage::Migrator).to receive(:migrate).twice.with(:local, :amazon, should_update_service_name: true)
+
+ with_modified_env FROM: 'local', TO: 'amazon', UPDATE_BLOB_SERVICE_NAME: nil do
+ task.invoke
+ task.reenable
+ task.invoke
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index e83db4046..984cd045f 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -7,6 +7,10 @@ require 'rspec/rails'
require 'pundit/rspec'
require 'sidekiq/testing'
+# Load Rake tasks
+require 'rake'
+Rails.application.load_tasks
+
# test-prof helpers for tests optimization
require 'test_prof/recipes/rspec/before_all'
require 'test_prof/recipes/rspec/let_it_be'
From a5858536905c61b7d9ee83ad82542b2c168df784 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan
Date: Tue, 16 Jun 2026 19:40:24 +0530
Subject: [PATCH 14/26] chore: expose advanced_search flag in super_admin UI
for self-hosted (#14750)
## Description
Removes `chatwoot_internal: true` from the `advanced_search` feature
flag so self-hosted enterprise userss can toggle it from the super_admin
UI instead of going through a rails console.
---
config/features.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/config/features.yml b/config/features.yml
index 03105588b..c5bc8f608 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -200,7 +200,6 @@
display_name: Advanced Search
enabled: false
premium: true
- chatwoot_internal: true
- name: saml
display_name: SAML
enabled: false
From 352f120c6a1f6480336f77fcd6427772f2e47c73 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Tue, 16 Jun 2026 20:01:31 +0530
Subject: [PATCH 15/26] feat: add dedicated color tokens for voice call widget
(#14745)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
# Pull Request Template
## Description
This PR introduces dedicated color tokens for the floating voice call
widget instead of reusing generic design tokens. This allows the widget
to maintain a distinct dark-card appearance across both light and dark
themes.
Adds the following tokens and applies them to `CallCard`:
* `--call-widget`
* `--call-widget-border`
* `--call-widget-text`
* `--call-widget-sub-text`
Fixes
https://linear.app/chatwoot/issue/CW-7353/call-notification-window-theme-update-design
## Type of change
- [x] New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
### Screenshots
**Light mode**
**Dark mode**
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [x] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---
.../dashboard/assets/scss/_next-colors.scss | 12 ++++++++++
.../components-next/call/CallCard.vue | 24 +++++++++----------
theme/colors.js | 5 ++++
3 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/app/javascript/dashboard/assets/scss/_next-colors.scss b/app/javascript/dashboard/assets/scss/_next-colors.scss
index 784edce6c..4a67e5182 100644
--- a/app/javascript/dashboard/assets/scss/_next-colors.scss
+++ b/app/javascript/dashboard/assets/scss/_next-colors.scss
@@ -145,6 +145,12 @@
--black-alpha-2: 0, 0, 0, 0.04;
--border-blue: 39, 129, 246, 0.5;
--white-alpha: 255, 255, 255, 0.8;
+
+ // Voice call widget - light mode
+ --call-widget: 33, 34, 38, 0.95;
+ --call-widget-border: 255, 255, 255, 0.1;
+ --call-widget-text: 237, 238, 240, 1;
+ --call-widget-sub-text: 173, 177, 184, 1;
}
.dark {
@@ -291,6 +297,12 @@
--border-blue: 39, 129, 246, 0.5;
--border-container: 255, 255, 255, 0;
--white-alpha: 255, 255, 255, 0.1;
+
+ // Voice call widget - dark mode
+ --call-widget: 50, 53, 61, 1;
+ --call-widget-border: 255, 255, 255, 0.07;
+ --call-widget-text: 237, 238, 240, 1;
+ --call-widget-sub-text: 173, 177, 184, 1;
}
}
// NEXT COLORS END
diff --git a/app/javascript/dashboard/components-next/call/CallCard.vue b/app/javascript/dashboard/components-next/call/CallCard.vue
index 55da3dacf..d041150c2 100644
--- a/app/javascript/dashboard/components-next/call/CallCard.vue
+++ b/app/javascript/dashboard/components-next/call/CallCard.vue
@@ -75,11 +75,11 @@ const channelIcon = computed(() => {
-
+
)',
container: 'rgba(var(--border-container))',
From fe6368b42ef2de901dffdc0c1a4d1b84a112db5d Mon Sep 17 00:00:00 2001
From: Sony Mathew
Date: Tue, 16 Jun 2026 23:46:49 +0530
Subject: [PATCH 16/26] feat: Add sidebar unread counts for filters (CW-7262)
(#14726)
## Description
Extends the conversation unread-count system so the left sidebar can
show unread badges for Mentions, Participating, Unattended, and saved
conversation folders. Folder badges reuse the existing `custom_filters`
conversation filter semantics, store user-scoped Redis sets lazily, and
skip unsupported folder filters so invalid saved folders continue to
render without a badge. The Unattended badge counts all visible unread
open conversations that match the existing unattended conversation
scope.
Closes
-
[CW-7262](https://linear.app/chatwoot/issue/CW-7262/unread-counts-for-filters-folders)
## What changed
- Added user-scoped unread-count Redis keys and cache builders for
mentions, participating conversations, unattended conversations, and
saved folder filters.
- Reused `Conversations::FilterService` through a relation-returning
path so folder counts match the folder conversation list behavior.
- Invalidated user filter caches from mention, participant,
custom-filter, and relevant conversation update events.
- Extended the unread-count endpoint payload and sidebar Vuex/sidebar
rendering for the new badge counts, including the Unattended sidebar
item.
- Added Ruby, Enterprise, request, listener, and frontend store coverage
for the new unread-count dimensions.
## Type of change
- [x] New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
- Created local validation folders for `john@acme.inc` and confirmed the
unread-count payload includes open, resolved, and high-priority folder
badges while excluding the invalid unsupported folder.
- Added coverage for the Unattended badge rule: all visible unread open
conversations matching `Conversation.unattended`.
- Ran focused unread-count Ruby specs, including service, listener,
request, and Enterprise counter coverage.
- Ran frontend unread-count store specs.
- Ran RuboCop on the touched Ruby files.
- Ran ESLint through the project script; it completed with warnings in
existing unrelated files and no errors.
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [x] I have commented on my code, particularly in hard-to-understand
areas
- [x] Documentation changes are not required for this internal
unread-count behavior
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [x] No dependent downstream changes are required
---------
Co-authored-by: Muhsin Keloth
---
app/finders/conversation_finder.rb | 2 +-
.../components-next/sidebar/ChannelLeaf.vue | 6 +-
.../components-next/sidebar/Sidebar.vue | 38 +++
.../sidebar/SidebarCollapsedPopover.vue | 10 +-
.../sidebar/SidebarGroupLeaf.vue | 5 +-
.../sidebar/SidebarUnreadBadge.vue | 2 +
.../sidebar/specs/ChannelLeaf.spec.js | 12 +
.../sidebar/specs/SidebarGroupLeaf.spec.js | 19 +-
.../dashboard/i18n/locale/en/settings.json | 10 +
.../store/modules/conversationUnreadCounts.js | 23 ++
.../conversationUnreadCounts/getters.spec.js | 22 ++
.../mutations.spec.js | 19 ++
app/listeners/action_cable_listener.rb | 4 +-
app/models/account.rb | 2 +-
app/models/account_user.rb | 9 +
app/models/concerns/cache_keys.rb | 1 -
app/models/conversation_participant.rb | 5 +
app/models/custom_filter.rb | 9 +
app/models/inbox_member.rb | 12 +
app/models/mention.rb | 5 +
app/services/conversations/filter_service.rb | 10 +-
.../unread_counts/broadcast_scope.rb | 14 +-
.../unread_counts/build_lock_keys.rb | 15 ++
.../conversations/unread_counts/builder.rb | 139 ++++++++++-
.../conversations/unread_counts/counter.rb | 45 ++--
.../unread_counts/filter_counter.rb | 40 ++++
.../conversations/unread_counts/listener.rb | 39 +++-
.../conversations/unread_counts/notifier.rb | 4 +-
.../conversations/unread_counts/store.rb | 20 +-
.../conversations/unread_counts/store_keys.rb | 16 ++
.../unread_counts/user_filter_notifier.rb | 19 ++
.../unread_counts/user_filter_store.rb | 100 ++++++++
app/services/filter_service.rb | 12 +-
.../finders/enterprise/conversation_finder.rb | 26 +++
enterprise/app/models/custom_role.rb | 23 ++
lib/redis/redis_keys.rb | 15 ++
.../accounts/conversations_controller_spec.rb | 43 +++-
.../super_admin/accounts_controller_spec.rb | 2 +-
.../finders/conversation_finder_spec.rb | 24 ++
spec/enterprise/models/account_user_spec.rb | 18 ++
spec/enterprise/models/custom_role_spec.rb | 34 +++
.../unread_counts/counter_spec.rb | 60 +++--
spec/finders/conversation_finder_spec.rb | 19 ++
spec/listeners/action_cable_listener_spec.rb | 14 ++
spec/models/account_spec.rb | 63 ++++-
spec/models/account_user_spec.rb | 28 +++
spec/models/inbox_member_spec.rb | 26 +++
.../unread_counts/builder_spec.rb | 197 +++++++++++++++-
.../unread_counts/counter_spec.rb | 78 ++++++-
.../unread_counts/listener_spec.rb | 51 +++-
.../unread_counts/notifier_spec.rb | 12 +
.../unread_counts/refresher_spec.rb | 2 +-
.../conversations/unread_counts/store_spec.rb | 218 +++++++++++++++++-
.../user_filter_notifier_spec.rb | 37 +++
54 files changed, 1581 insertions(+), 97 deletions(-)
create mode 100644 app/services/conversations/unread_counts/build_lock_keys.rb
create mode 100644 app/services/conversations/unread_counts/filter_counter.rb
create mode 100644 app/services/conversations/unread_counts/user_filter_notifier.rb
create mode 100644 app/services/conversations/unread_counts/user_filter_store.rb
create mode 100644 spec/enterprise/finders/conversation_finder_spec.rb
create mode 100644 spec/services/conversations/unread_counts/user_filter_notifier_spec.rb
diff --git a/app/finders/conversation_finder.rb b/app/finders/conversation_finder.rb
index 74bf903f5..9d53ec97e 100644
--- a/app/finders/conversation_finder.rb
+++ b/app/finders/conversation_finder.rb
@@ -142,7 +142,7 @@ class ConversationFinder
conversation_ids = current_account.mentions.where(user: current_user).pluck(:conversation_id)
@conversations = @conversations.where(id: conversation_ids)
when 'participating'
- @conversations = current_user.participating_conversations.where(account_id: current_account.id)
+ @conversations = @conversations.where(id: current_user.participating_conversations.where(account_id: current_account.id).select(:id))
when 'unattended'
@conversations = @conversations.unattended
end
diff --git a/app/javascript/dashboard/components-next/sidebar/ChannelLeaf.vue b/app/javascript/dashboard/components-next/sidebar/ChannelLeaf.vue
index a995cf510..234737008 100644
--- a/app/javascript/dashboard/components-next/sidebar/ChannelLeaf.vue
+++ b/app/javascript/dashboard/components-next/sidebar/ChannelLeaf.vue
@@ -22,6 +22,10 @@ const props = defineProps({
type: [Number, String],
default: 0,
},
+ badgeTooltip: {
+ type: String,
+ default: '',
+ },
});
const reauthorizationRequired = computed(() => {
@@ -34,7 +38,7 @@ const reauthorizationRequired = computed(() => {
-
Date: Sat, 20 Jun 2026 14:47:08 -0700
Subject: [PATCH 26/26] feat(captain): allow agents to report Captain messages
(#14799)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Adds a cloud-only flow for agents to flag incorrect or problematic
Captain (AI) responses. Right-clicking a Captain message surfaces a
"Report message" option that opens a dialog to pick a problem type and
add a description, persisted to a new captain_message_reports table for
the team to review.
---------
Co-authored-by: Claude Opus 4.8 (1M context)
---
.../dashboard/api/captain/messageReports.js | 9 ++
.../components-next/message/Message.vue | 10 ++
.../i18n/locale/en/conversation.json | 19 +++
.../components/MessageContextMenu.vue | 21 ++++
.../components/ReportCaptainMessageDialog.vue | 119 ++++++++++++++++++
config/routes.rb | 1 +
...20000000_create_captain_message_reports.rb | 14 +++
db/schema.rb | 17 ++-
.../captain/message_reports_controller.rb | 38 ++++++
.../app/models/captain/message_report.rb | 46 +++++++
.../app/models/enterprise/concerns/message.rb | 1 +
.../message_reports/create.json.jbuilder | 7 ++
.../message_reports_controller_spec.rb | 117 +++++++++++++++++
.../models/captain/message_report_spec.rb | 40 ++++++
spec/factories/captain/message_report.rb | 8 ++
15 files changed, 466 insertions(+), 1 deletion(-)
create mode 100644 app/javascript/dashboard/api/captain/messageReports.js
create mode 100644 app/javascript/dashboard/modules/conversations/components/ReportCaptainMessageDialog.vue
create mode 100644 db/migrate/20260620000000_create_captain_message_reports.rb
create mode 100644 enterprise/app/controllers/api/v1/accounts/captain/message_reports_controller.rb
create mode 100644 enterprise/app/models/captain/message_report.rb
create mode 100644 enterprise/app/views/api/v1/accounts/captain/message_reports/create.json.jbuilder
create mode 100644 spec/enterprise/controllers/api/v1/accounts/captain/message_reports_controller_spec.rb
create mode 100644 spec/enterprise/models/captain/message_report_spec.rb
create mode 100644 spec/factories/captain/message_report.rb
diff --git a/app/javascript/dashboard/api/captain/messageReports.js b/app/javascript/dashboard/api/captain/messageReports.js
new file mode 100644
index 000000000..2df1e5747
--- /dev/null
+++ b/app/javascript/dashboard/api/captain/messageReports.js
@@ -0,0 +1,9 @@
+import ApiClient from '../ApiClient';
+
+class MessageReports extends ApiClient {
+ constructor() {
+ super('captain/message_reports', { accountScoped: true });
+ }
+}
+
+export default new MessageReports();
diff --git a/app/javascript/dashboard/components-next/message/Message.vue b/app/javascript/dashboard/components-next/message/Message.vue
index 0ef64eedf..cd3c7d5dc 100644
--- a/app/javascript/dashboard/components-next/message/Message.vue
+++ b/app/javascript/dashboard/components-next/message/Message.vue
@@ -147,8 +147,14 @@ const { t } = useI18n();
const route = useRoute();
const inboxGetter = useMapGetter('inboxes/getInbox');
const inbox = computed(() => inboxGetter.value(props.inboxId) || {});
+const isOnChatwootCloud = useMapGetter('globalConfig/isOnChatwootCloud');
const { replaceInstallationName } = useBranding();
+const isCaptainMessage = computed(() => {
+ const senderType = props.sender?.type ?? props.senderType;
+ return senderType === SENDER_TYPES.CAPTAIN_ASSISTANT;
+});
+
/**
* Computes the message variant based on props
* @type {import('vue').ComputedRef<'user'|'agent'|'activity'|'private'|'bot'|'template'>}
@@ -390,6 +396,10 @@ const contextMenuEnabledOptions = computed(() => {
!props.private &&
props.inboxSupportsReplyTo.outgoing &&
!isFailedOrProcessing,
+ report:
+ isOnChatwootCloud.value &&
+ isCaptainMessage.value &&
+ !isMessageDeleted.value,
};
});
diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index 045b8d0d9..c34ed44de 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -304,6 +304,25 @@
"MESSAGE": "You cannot undo this action",
"DELETE": "Delete",
"CANCEL": "Cancel"
+ },
+ "REPORT_MESSAGE": {
+ "LABEL": "Report message",
+ "TITLE": "Report Captain message",
+ "DESCRIPTION": "Found an issue with this AI response? Let us know what went wrong and our team will review it to help improve Captain's accuracy.",
+ "PROBLEM_TYPE": "Problem type",
+ "PROBLEM_TYPE_PLACEHOLDER": "Select a problem type",
+ "DESCRIPTION_LABEL": "Description",
+ "DESCRIPTION_PLACEHOLDER": "Describe the problem in detail",
+ "SUBMIT": "Report",
+ "SUCCESS": "Thanks for reporting. Our team will take a look.",
+ "ERROR": "Could not report this message. Please try again.",
+ "REASONS": {
+ "incorrect_information": "Incorrect information",
+ "inappropriate_response": "Inappropriate response",
+ "incomplete_response": "Incomplete response",
+ "outdated_information": "Outdated information",
+ "other": "Other"
+ }
}
},
"SIDEBAR": {
diff --git a/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue b/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue
index a100b379f..4cfde97aa 100644
--- a/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue
+++ b/app/javascript/dashboard/modules/conversations/components/MessageContextMenu.vue
@@ -14,6 +14,7 @@ import {
import MenuItem from '../../../components/widgets/conversation/contextMenu/menuItem.vue';
import { useTrack } from 'dashboard/composables';
import NextButton from 'dashboard/components-next/button/Button.vue';
+import ReportCaptainMessageDialog from './ReportCaptainMessageDialog.vue';
export default {
components: {
@@ -21,6 +22,7 @@ export default {
MenuItem,
ContextMenu,
NextButton,
+ ReportCaptainMessageDialog,
},
props: {
message: {
@@ -152,6 +154,10 @@ export default {
closeDeleteModal() {
this.showDeleteModal = false;
},
+ openReportDialog() {
+ this.handleClose();
+ this.$refs.reportDialog?.open();
+ },
},
};
@@ -243,6 +249,16 @@ export default {
variant="icon"
@click.stop="showCannedResponseModal"
/>
+
+
+
diff --git a/app/javascript/dashboard/modules/conversations/components/ReportCaptainMessageDialog.vue b/app/javascript/dashboard/modules/conversations/components/ReportCaptainMessageDialog.vue
new file mode 100644
index 000000000..4d36efe78
--- /dev/null
+++ b/app/javascript/dashboard/modules/conversations/components/ReportCaptainMessageDialog.vue
@@ -0,0 +1,119 @@
+
+
+
+
+
diff --git a/config/routes.rb b/config/routes.rb
index f86e3f2cb..64e1df440 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -74,6 +74,7 @@ Rails.application.routes.draw do
resources :scenarios
end
resources :assistant_responses
+ resources :message_reports, only: [:create]
resources :bulk_actions, only: [:create]
resources :copilot_threads, only: [:index, :create] do
resources :copilot_messages, only: [:index, :create]
diff --git a/db/migrate/20260620000000_create_captain_message_reports.rb b/db/migrate/20260620000000_create_captain_message_reports.rb
new file mode 100644
index 000000000..41fc2f037
--- /dev/null
+++ b/db/migrate/20260620000000_create_captain_message_reports.rb
@@ -0,0 +1,14 @@
+class CreateCaptainMessageReports < ActiveRecord::Migration[7.1]
+ def change
+ create_table :captain_message_reports do |t|
+ t.references :account, null: false
+ t.references :conversation, null: false
+ t.references :message, null: false
+ t.references :user, null: false
+ t.string :report_reason, null: false
+ t.text :description
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index cbddbcce2..a3513ca83 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.1].define(version: 2026_06_11_184600) do
+ActiveRecord::Schema[7.1].define(version: 2026_06_20_000000) do
# These extensions should be enabled to support this database
enable_extension "pg_stat_statements"
enable_extension "pg_trgm"
@@ -399,6 +399,21 @@ ActiveRecord::Schema[7.1].define(version: 2026_06_11_184600) do
t.index ["inbox_id"], name: "index_captain_inboxes_on_inbox_id"
end
+ create_table "captain_message_reports", force: :cascade do |t|
+ t.bigint "account_id", null: false
+ t.bigint "conversation_id", null: false
+ t.bigint "message_id", null: false
+ t.bigint "user_id", null: false
+ t.string "report_reason", null: false
+ t.text "description"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["account_id"], name: "index_captain_message_reports_on_account_id"
+ t.index ["conversation_id"], name: "index_captain_message_reports_on_conversation_id"
+ t.index ["message_id"], name: "index_captain_message_reports_on_message_id"
+ t.index ["user_id"], name: "index_captain_message_reports_on_user_id"
+ end
+
create_table "captain_scenarios", force: :cascade do |t|
t.string "title"
t.text "description"
diff --git a/enterprise/app/controllers/api/v1/accounts/captain/message_reports_controller.rb b/enterprise/app/controllers/api/v1/accounts/captain/message_reports_controller.rb
new file mode 100644
index 000000000..abce5ffcc
--- /dev/null
+++ b/enterprise/app/controllers/api/v1/accounts/captain/message_reports_controller.rb
@@ -0,0 +1,38 @@
+class Api::V1::Accounts::Captain::MessageReportsController < Api::V1::Accounts::BaseController
+ before_action :ensure_cloud_installation
+ before_action :set_message
+ before_action :authorize_conversation
+ before_action :ensure_captain_message
+
+ def create
+ @message_report = @message.message_reports.create!(
+ user: Current.user,
+ report_reason: permitted_params[:report_reason],
+ description: permitted_params[:description]
+ )
+ end
+
+ private
+
+ def ensure_cloud_installation
+ render json: { error: 'Not available' }, status: :not_found unless ChatwootApp.chatwoot_cloud?
+ end
+
+ def set_message
+ @message = Current.account.messages.find(permitted_params[:message_id])
+ end
+
+ def authorize_conversation
+ authorize @message.conversation, :show?
+ end
+
+ def ensure_captain_message
+ return if @message.sender_type == 'Captain::Assistant'
+
+ render json: { error: 'Only Captain messages can be reported' }, status: :unprocessable_entity
+ end
+
+ def permitted_params
+ params.permit(:message_id, :report_reason, :description)
+ end
+end
diff --git a/enterprise/app/models/captain/message_report.rb b/enterprise/app/models/captain/message_report.rb
new file mode 100644
index 000000000..4fcb609fe
--- /dev/null
+++ b/enterprise/app/models/captain/message_report.rb
@@ -0,0 +1,46 @@
+# == Schema Information
+#
+# Table name: captain_message_reports
+#
+# id :bigint not null, primary key
+# description :text
+# report_reason :string not null
+# created_at :datetime not null
+# updated_at :datetime not null
+# account_id :bigint not null
+# conversation_id :bigint not null
+# message_id :bigint not null
+# user_id :bigint not null
+#
+# Indexes
+#
+# index_captain_message_reports_on_account_id (account_id)
+# index_captain_message_reports_on_conversation_id (conversation_id)
+# index_captain_message_reports_on_message_id (message_id)
+# index_captain_message_reports_on_user_id (user_id)
+#
+class Captain::MessageReport < ApplicationRecord
+ self.table_name = 'captain_message_reports'
+
+ REPORT_REASONS = %w[incorrect_information inappropriate_response incomplete_response outdated_information other].freeze
+
+ belongs_to :account
+ # `Captain::Conversation` exists as a job namespace, so the association would
+ # resolve to that module instead of the top-level model without this override.
+ belongs_to :conversation, class_name: '::Conversation'
+ belongs_to :message
+ belongs_to :user
+
+ validates :report_reason, presence: true, inclusion: { in: REPORT_REASONS }
+
+ before_validation :ensure_account_and_conversation
+
+ private
+
+ def ensure_account_and_conversation
+ return if message.blank?
+
+ self.account ||= message.account
+ self.conversation ||= message.conversation
+ end
+end
diff --git a/enterprise/app/models/enterprise/concerns/message.rb b/enterprise/app/models/enterprise/concerns/message.rb
index cfdea430b..3c7cdc3f7 100644
--- a/enterprise/app/models/enterprise/concerns/message.rb
+++ b/enterprise/app/models/enterprise/concerns/message.rb
@@ -3,5 +3,6 @@ module Enterprise::Concerns::Message
included do
has_one :call, dependent: :nullify
+ has_many :message_reports, class_name: 'Captain::MessageReport', dependent: :destroy_async
end
end
diff --git a/enterprise/app/views/api/v1/accounts/captain/message_reports/create.json.jbuilder b/enterprise/app/views/api/v1/accounts/captain/message_reports/create.json.jbuilder
new file mode 100644
index 000000000..f45c0078b
--- /dev/null
+++ b/enterprise/app/views/api/v1/accounts/captain/message_reports/create.json.jbuilder
@@ -0,0 +1,7 @@
+json.id @message_report.id
+json.message_id @message_report.message_id
+json.conversation_id @message_report.conversation_id
+json.user_id @message_report.user_id
+json.report_reason @message_report.report_reason
+json.description @message_report.description
+json.created_at @message_report.created_at.to_i
diff --git a/spec/enterprise/controllers/api/v1/accounts/captain/message_reports_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/captain/message_reports_controller_spec.rb
new file mode 100644
index 000000000..129888812
--- /dev/null
+++ b/spec/enterprise/controllers/api/v1/accounts/captain/message_reports_controller_spec.rb
@@ -0,0 +1,117 @@
+require 'rails_helper'
+
+RSpec.describe 'Api::V1::Accounts::Captain::MessageReports', type: :request do
+ let(:account) { create(:account) }
+ let(:agent) { create(:user, account: account, role: :agent) }
+ let(:inbox) { create(:inbox, account: account) }
+ let(:conversation) { create(:conversation, account: account, inbox: inbox) }
+ let(:assistant) { create(:captain_assistant, account: account) }
+ let(:message) do
+ create(:message, account: account, conversation: conversation, message_type: :outgoing, sender: assistant)
+ end
+
+ before { create(:inbox_member, user: agent, inbox: inbox) }
+
+ def json_response
+ JSON.parse(response.body, symbolize_names: true)
+ end
+
+ describe 'POST /api/v1/accounts/:account_id/captain/message_reports' do
+ let(:valid_params) do
+ {
+ message_id: message.id,
+ report_reason: 'incorrect_information',
+ description: 'The generated citation is wrong.'
+ }
+ end
+
+ context 'when it is an unauthenticated user' do
+ it 'returns unauthorized' do
+ post "/api/v1/accounts/#{account.id}/captain/message_reports", params: valid_params, as: :json
+
+ expect(response).to have_http_status(:unauthorized)
+ end
+ end
+
+ context 'when the installation is not on Chatwoot cloud' do
+ before { InstallationConfig.where(name: 'DEPLOYMENT_ENV').first_or_initialize.update!(value: 'self_hosted') }
+
+ it 'returns not found' do
+ post "/api/v1/accounts/#{account.id}/captain/message_reports",
+ params: valid_params, headers: agent.create_new_auth_token, as: :json
+
+ expect(response).to have_http_status(:not_found)
+ end
+
+ it 'does not create a report' do
+ expect do
+ post "/api/v1/accounts/#{account.id}/captain/message_reports",
+ params: valid_params, headers: agent.create_new_auth_token, as: :json
+ end.not_to change(Captain::MessageReport, :count)
+ end
+ end
+
+ context 'when on Chatwoot cloud' do
+ before { InstallationConfig.where(name: 'DEPLOYMENT_ENV').first_or_initialize.update!(value: 'cloud') }
+
+ it 'creates a message report for the reporting agent' do
+ expect do
+ post "/api/v1/accounts/#{account.id}/captain/message_reports",
+ params: valid_params, headers: agent.create_new_auth_token, as: :json
+ end.to change(Captain::MessageReport, :count).by(1)
+
+ report = Captain::MessageReport.last
+ aggregate_failures do
+ expect(response).to have_http_status(:success)
+ expect(report.message_id).to eq(message.id)
+ expect(report.conversation_id).to eq(conversation.id)
+ expect(report.user_id).to eq(agent.id)
+ expect(report.report_reason).to eq('incorrect_information')
+ expect(report.description).to eq('The generated citation is wrong.')
+ expect(json_response[:report_reason]).to eq('incorrect_information')
+ end
+ end
+
+ it 'returns not found when the message does not belong to the account' do
+ other_message = create(:message)
+
+ post "/api/v1/accounts/#{account.id}/captain/message_reports",
+ params: valid_params.merge(message_id: other_message.id),
+ headers: agent.create_new_auth_token, as: :json
+
+ expect(response).to have_http_status(:not_found)
+ end
+
+ it 'returns unprocessable entity for an invalid report reason' do
+ post "/api/v1/accounts/#{account.id}/captain/message_reports",
+ params: valid_params.merge(report_reason: 'invalid_reason'),
+ headers: agent.create_new_auth_token, as: :json
+
+ expect(response).to have_http_status(:unprocessable_entity)
+ end
+
+ it 'does not allow an agent without access to the conversation to report' do
+ other_agent = create(:user, account: account, role: :agent)
+
+ expect do
+ post "/api/v1/accounts/#{account.id}/captain/message_reports",
+ params: valid_params, headers: other_agent.create_new_auth_token, as: :json
+ end.not_to change(Captain::MessageReport, :count)
+
+ expect(response).to have_http_status(:unauthorized)
+ end
+
+ it 'rejects messages that were not sent by a Captain assistant' do
+ non_captain_message = create(:message, account: account, conversation: conversation)
+
+ expect do
+ post "/api/v1/accounts/#{account.id}/captain/message_reports",
+ params: valid_params.merge(message_id: non_captain_message.id),
+ headers: agent.create_new_auth_token, as: :json
+ end.not_to change(Captain::MessageReport, :count)
+
+ expect(response).to have_http_status(:unprocessable_entity)
+ end
+ end
+ end
+end
diff --git a/spec/enterprise/models/captain/message_report_spec.rb b/spec/enterprise/models/captain/message_report_spec.rb
new file mode 100644
index 000000000..ded42890c
--- /dev/null
+++ b/spec/enterprise/models/captain/message_report_spec.rb
@@ -0,0 +1,40 @@
+require 'rails_helper'
+
+RSpec.describe Captain::MessageReport, type: :model do
+ describe 'associations' do
+ it { is_expected.to belong_to(:account) }
+ it { is_expected.to belong_to(:conversation) }
+ it { is_expected.to belong_to(:message) }
+ it { is_expected.to belong_to(:user) }
+
+ it 'resolves the conversation association to the top-level Conversation model' do
+ # `Captain::Conversation` exists as a job namespace, so without an explicit
+ # class_name the association would resolve to that module instead.
+ expect(described_class.reflect_on_association(:conversation).klass).to eq(Conversation)
+ end
+ end
+
+ describe 'validations' do
+ it { is_expected.to validate_presence_of(:report_reason) }
+ it { is_expected.to validate_inclusion_of(:report_reason).in_array(described_class::REPORT_REASONS) }
+ end
+
+ describe 'callbacks' do
+ let(:account) { create(:account) }
+ let(:conversation) { create(:conversation, account: account) }
+ let(:message) { create(:message, account: account, conversation: conversation) }
+
+ it 'derives the account and conversation from the message' do
+ report = described_class.create!(message: message, user: create(:user, account: account), report_reason: 'other')
+
+ expect(report.account).to eq(account)
+ expect(report.conversation).to eq(conversation)
+ end
+ end
+
+ describe 'factory' do
+ it 'creates a valid message report' do
+ expect(build(:captain_message_report)).to be_valid
+ end
+ end
+end
diff --git a/spec/factories/captain/message_report.rb b/spec/factories/captain/message_report.rb
new file mode 100644
index 000000000..d7f1cfca0
--- /dev/null
+++ b/spec/factories/captain/message_report.rb
@@ -0,0 +1,8 @@
+FactoryBot.define do
+ factory :captain_message_report, class: 'Captain::MessageReport' do
+ report_reason { 'incorrect_information' }
+ description { 'The generated citation is wrong.' }
+ association :message
+ association :user
+ end
+end
@@ -100,10 +100,10 @@ const channelIcon = computed(() => {
@@ -149,13 +149,13 @@ const channelIcon = computed(() => {
{{ duration }}
@@ -132,7 +132,7 @@ const channelIcon = computed(() => { slate ghost xs - class="!rounded-full -my-1" + class="!rounded-full -my-1 -me-1 !text-n-call-widget-sub-text" @click="$emit('dismiss')" />{{ callInfo.contactName }}
{{ callInfo.phoneNumber }}
@@ -217,23 +217,23 @@ const channelIcon = computed(() => { >{{ label }}
-
})
);
+const unreadBadgeTooltips = computed(() => ({
+ ALL: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.ALL'),
+ INBOX: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.INBOX'),
+ LABEL: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.LABEL'),
+ TEAM: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.TEAM'),
+ FOLDER: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.FOLDER'),
+ MENTIONS: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.MENTIONS'),
+ PARTICIPATING: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.PARTICIPATING'),
+ UNATTENDED: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.UNATTENDED'),
+}));
+
+const unreadBadgeTooltip = type => unreadBadgeTooltips.value[type];
+
const closeMobileSidebar = () => {
if (!props.isMobileSidebarOpen) return;
emit('closeMobileSidebar');
@@ -335,12 +360,15 @@ const menuItems = computed(() => {
label: t('SIDEBAR.ALL_CONVERSATIONS'),
icon: 'i-lucide-inbox',
badgeCount: allUnreadCount.value,
+ badgeTooltip: unreadBadgeTooltip('ALL'),
activeOn: ['inbox_conversation'],
to: accountScopedRoute('home'),
},
{
name: 'Mentions',
label: t('SIDEBAR.MENTIONED_CONVERSATIONS'),
+ badgeCount: mentionsUnreadCount.value,
+ badgeTooltip: unreadBadgeTooltip('MENTIONS'),
icon: 'i-lucide-at-sign',
activeOn: ['conversation_through_mentions'],
to: accountScopedRoute('conversation_mentions'),
@@ -348,6 +376,8 @@ const menuItems = computed(() => {
{
name: 'Participating',
label: t('SIDEBAR.PARTICIPATING_CONVERSATIONS'),
+ badgeCount: participatingUnreadCount.value,
+ badgeTooltip: unreadBadgeTooltip('PARTICIPATING'),
icon: 'i-lucide-user-round-check',
activeOn: ['conversation_through_participating'],
to: accountScopedRoute('conversation_participating'),
@@ -355,6 +385,8 @@ const menuItems = computed(() => {
{
name: 'Unattended',
activeOn: ['conversation_through_unattended'],
+ badgeCount: unattendedUnreadCount.value,
+ badgeTooltip: unreadBadgeTooltip('UNATTENDED'),
label: t('SIDEBAR.UNATTENDED_CONVERSATIONS'),
icon: 'i-lucide-clock-alert',
to: accountScopedRoute('conversation_unattended'),
@@ -370,6 +402,8 @@ const menuItems = computed(() => {
children: sortedFolders.value.map(view => ({
name: `${view.name}-${view.id}`,
label: view.name,
+ badgeCount: getFolderUnreadCount.value(view.id),
+ badgeTooltip: unreadBadgeTooltip('FOLDER'),
to: accountScopedRoute('folder_conversations', { id: view.id }),
})),
},
@@ -385,6 +419,7 @@ const menuItems = computed(() => {
name: `${team.name}-${team.id}`,
label: team.name,
badgeCount: getTeamUnreadCount.value(team.id),
+ badgeTooltip: unreadBadgeTooltip('TEAM'),
to: accountScopedRoute('team_conversations', { teamId: team.id }),
})),
},
@@ -400,6 +435,7 @@ const menuItems = computed(() => {
name: `${inbox.name}-${inbox.id}`,
label: inbox.name,
badgeCount: getInboxUnreadCount.value(inbox.id),
+ badgeTooltip: unreadBadgeTooltip('INBOX'),
icon: h(ChannelIcon, { inbox, class: 'size-[16px]' }),
to: accountScopedRoute('inbox_dashboard', { inbox_id: inbox.id }),
component: leafProps =>
@@ -408,6 +444,7 @@ const menuItems = computed(() => {
active: leafProps.active,
inbox,
badgeCount: leafProps.badgeCount,
+ badgeTooltip: leafProps.badgeTooltip,
}),
})),
},
@@ -423,6 +460,7 @@ const menuItems = computed(() => {
name: `${label.title}-${label.id}`,
label: label.title,
badgeCount: getLabelUnreadCount.value(label.id),
+ badgeTooltip: unreadBadgeTooltip('LABEL'),
icon: h('span', {
class: `size-[8px] rounded-sm`,
style: { backgroundColor: label.color },
diff --git a/app/javascript/dashboard/components-next/sidebar/SidebarCollapsedPopover.vue b/app/javascript/dashboard/components-next/sidebar/SidebarCollapsedPopover.vue
index 2e431eb7e..8f1de246e 100644
--- a/app/javascript/dashboard/components-next/sidebar/SidebarCollapsedPopover.vue
+++ b/app/javascript/dashboard/components-next/sidebar/SidebarCollapsedPopover.vue
@@ -197,7 +197,10 @@ onMounted(async () => {
class="size-4 flex-shrink-0"
/>
{{ subChild.label }}
- d'.freeze
UNREAD_CONVERSATIONS_BASE_READY = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::READY::BASE'.freeze
UNREAD_CONVERSATIONS_ASSIGNMENT_READY = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::READY::ASSIGNMENT'.freeze
+ UNREAD_CONVERSATIONS_USER_FILTERS_READY =
+ 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::READY::FILTERS'.freeze
+ UNREAD_CONVERSATIONS_FILTERS_VERSION = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::VERSION::FILTERS'.freeze
+ UNREAD_CONVERSATIONS_USER_FILTERS_VERSION =
+ 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::VERSION::FILTERS'.freeze
UNREAD_CONVERSATIONS_BASE_BUILD_LOCK = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::BUILD_LOCK::BASE'.freeze
UNREAD_CONVERSATIONS_ASSIGNMENT_BUILD_LOCK = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::BUILD_LOCK::ASSIGNMENT'.freeze
+ UNREAD_CONVERSATIONS_USER_FILTERS_BUILD_LOCK =
+ 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::BUILD_LOCK::FILTERS'.freeze
UNREAD_CONVERSATIONS_INBOX = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::INBOX::%d'.freeze
UNREAD_CONVERSATIONS_LABEL_INBOX =
'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::LABEL::%d::INBOX::%d'.freeze
@@ -33,6 +40,14 @@ module Redis::RedisKeys
'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::TEAM::%d::INBOX::%d::UNASSIGNED'.freeze
UNREAD_CONVERSATIONS_TEAM_INBOX_ASSIGNEE =
'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::TEAM::%d::INBOX::%d::ASSIGNEE::%d'.freeze
+ UNREAD_CONVERSATIONS_USER_MENTIONS =
+ 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::MENTIONS'.freeze
+ UNREAD_CONVERSATIONS_USER_PARTICIPATING =
+ 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::PARTICIPATING'.freeze
+ UNREAD_CONVERSATIONS_USER_UNATTENDED =
+ 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::UNATTENDED'.freeze
+ UNREAD_CONVERSATIONS_USER_FOLDER =
+ 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::FOLDER::%d'.freeze
## User Keys
# SSO Auth Tokens
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index bdb8117ac..de3cc4a3c 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -123,7 +123,7 @@ RSpec.describe 'Conversations API', type: :request do
end
after do
- Conversations::UnreadCounts::Store.clear_account!(account.id)
+ Conversations::UnreadCounts::Store.clear_all_account!(account.id)
end
context 'when conversation unread counts feature is enabled' do
@@ -144,7 +144,42 @@ RSpec.describe 'Conversations API', type: :request do
'all_count' => 1,
'inboxes' => { visible_inbox.id.to_s => 1 },
'labels' => { label.id.to_s => 1 },
- 'teams' => {}
+ 'teams' => {},
+ 'mentions_count' => 0,
+ 'participating_count' => 0,
+ 'unattended_count' => 1,
+ 'folders' => {}
+ )
+ end
+
+ it 'returns unread counts for mentions, participating conversations, unattended conversations, and folders' do
+ mentioned_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
+ participating_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
+ resolved_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
+ resolved_conversation.update!(status: :resolved)
+ custom_filter = create(:custom_filter, account: account, user: agent, filter_type: :conversation, query: {
+ payload: [{
+ attribute_key: 'status',
+ filter_operator: 'equal_to',
+ values: ['resolved'],
+ query_operator: nil,
+ custom_attribute_type: ''
+ }]
+ })
+
+ create(:mention, account: account, conversation: mentioned_conversation, user: agent)
+ create(:conversation_participant, account: account, conversation: participating_conversation, user: agent)
+
+ get "/api/v1/accounts/#{account.id}/conversations/unread_counts",
+ headers: agent.create_new_auth_token,
+ as: :json
+
+ expect(response).to have_http_status(:success)
+ expect(response.parsed_body['payload']).to include(
+ 'mentions_count' => 1,
+ 'participating_count' => 1,
+ 'unattended_count' => 2,
+ 'folders' => { custom_filter.id.to_s => 1 }
)
end
@@ -862,7 +897,7 @@ RSpec.describe 'Conversations API', type: :request do
expect(response).to have_http_status(:success)
expect(Conversations::UnreadCounts::Store.counts_for_keys([inbox_key])).to eq(inbox_key => 0)
ensure
- Conversations::UnreadCounts::Store.clear_account!(account.id)
+ Conversations::UnreadCounts::Store.clear_all_account!(account.id)
end
it 'updates both if one timestamp is old even when the other is recent' do
@@ -949,7 +984,7 @@ RSpec.describe 'Conversations API', type: :request do
expect(response).to have_http_status(:success)
expect(Conversations::UnreadCounts::Store.counts_for_keys([inbox_key])).to eq(inbox_key => 1)
ensure
- Conversations::UnreadCounts::Store.clear_account!(account.id)
+ Conversations::UnreadCounts::Store.clear_all_account!(account.id)
end
end
end
diff --git a/spec/controllers/super_admin/accounts_controller_spec.rb b/spec/controllers/super_admin/accounts_controller_spec.rb
index e4ff81a08..917499cd5 100644
--- a/spec/controllers/super_admin/accounts_controller_spec.rb
+++ b/spec/controllers/super_admin/accounts_controller_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe 'Super Admin accounts API', type: :request do
end
after do
- Conversations::UnreadCounts::Store.clear_account!(account.id)
+ Conversations::UnreadCounts::Store.clear_all_account!(account.id)
end
context 'when it is an unauthenticated user' do
diff --git a/spec/enterprise/finders/conversation_finder_spec.rb b/spec/enterprise/finders/conversation_finder_spec.rb
new file mode 100644
index 000000000..f8b9fce58
--- /dev/null
+++ b/spec/enterprise/finders/conversation_finder_spec.rb
@@ -0,0 +1,24 @@
+require 'rails_helper'
+
+RSpec.describe ConversationFinder do
+ describe '#perform' do
+ it 'returns participant-only conversations for custom roles with participating permission' do
+ account = create(:account)
+ agent = create(:user, account: account, role: :agent)
+ other_agent = create(:user, account: account, role: :agent)
+ inbox = create(:inbox, account: account, enable_auto_assignment: false)
+ custom_role = create(:custom_role, account: account, permissions: ['conversation_participating_manage'])
+ participating_conversation = create(:conversation, account: account, inbox: inbox, assignee: other_agent)
+
+ create(:inbox_member, user: agent, inbox: inbox)
+ create(:inbox_member, user: other_agent, inbox: inbox)
+ create(:conversation_participant, account: account, conversation: participating_conversation, user: agent)
+ account.account_users.find_by!(user_id: agent.id).update!(custom_role: custom_role)
+ Current.account = account
+
+ result = described_class.new(agent, { status: 'open', conversation_type: 'participating' }).perform
+
+ expect(result[:conversations].map(&:id)).to include(participating_conversation.id)
+ end
+ end
+end
diff --git a/spec/enterprise/models/account_user_spec.rb b/spec/enterprise/models/account_user_spec.rb
index fb572e86a..e157d9acd 100644
--- a/spec/enterprise/models/account_user_spec.rb
+++ b/spec/enterprise/models/account_user_spec.rb
@@ -29,6 +29,24 @@ RSpec.describe AccountUser, type: :model do
end
end
+ describe 'unread filter count invalidation' do
+ it 'notifies when the assigned custom role changes' do
+ account = create(:account)
+ custom_role = create(:custom_role, account: account)
+ account_user = create(:account_user, account: account)
+ notifier = instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true)
+ allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
+
+ account_user.update!(custom_role: custom_role)
+
+ expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(
+ account: account,
+ user: account_user.user
+ )
+ expect(notifier).to have_received(:perform)
+ end
+ end
+
describe 'audit log' do
context 'when account user is created' do
it 'has associated audit log created' do
diff --git a/spec/enterprise/models/custom_role_spec.rb b/spec/enterprise/models/custom_role_spec.rb
index f63f3c2dd..553a5a33a 100644
--- a/spec/enterprise/models/custom_role_spec.rb
+++ b/spec/enterprise/models/custom_role_spec.rb
@@ -9,4 +9,38 @@ RSpec.describe CustomRole, type: :model do
describe 'validations' do
it { is_expected.to validate_presence_of(:name) }
end
+
+ describe 'unread filter count invalidation' do
+ it 'notifies assigned users when permissions change' do
+ account = create(:account)
+ custom_role = create(:custom_role, account: account, permissions: ['conversation_participating_manage'])
+ account_user = create(:account_user, account: account, custom_role: custom_role)
+ notifier = instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true)
+ allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
+
+ custom_role.update!(permissions: ['conversation_manage'])
+
+ expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(
+ account: account,
+ user: account_user.user
+ )
+ expect(notifier).to have_received(:perform)
+ end
+
+ it 'notifies assigned users when the custom role is destroyed' do
+ account = create(:account)
+ custom_role = create(:custom_role, account: account, permissions: ['conversation_participating_manage'])
+ account_user = create(:account_user, account: account, custom_role: custom_role)
+ notifier = instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true)
+ allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
+
+ custom_role.destroy!
+
+ expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(
+ account: account,
+ user: account_user.user
+ )
+ expect(notifier).to have_received(:perform)
+ end
+ end
end
diff --git a/spec/enterprise/services/conversations/unread_counts/counter_spec.rb b/spec/enterprise/services/conversations/unread_counts/counter_spec.rb
index e8f850e78..86a93bd8c 100644
--- a/spec/enterprise/services/conversations/unread_counts/counter_spec.rb
+++ b/spec/enterprise/services/conversations/unread_counts/counter_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Conversations::UnreadCounts::Counter do
end
after do
- store.clear_account!(account.id)
+ store.clear_all_account!(account.id)
end
it 'uses base counts for custom roles with conversation_manage permission' do
@@ -26,10 +26,16 @@ RSpec.describe Conversations::UnreadCounts::Counter do
result = described_class.new(account: account, user: agent).perform
- expect(result[:all_count]).to eq(2)
- expect(result[:inboxes]).to eq(inbox.id.to_s => 2)
- expect(result[:labels]).to eq(label.id.to_s => 2)
- expect(result[:teams]).to eq(team.id.to_s => 2)
+ expect(result).to eq(
+ all_count: 2,
+ inboxes: { inbox.id.to_s => 2 },
+ labels: { label.id.to_s => 2 },
+ teams: { team.id.to_s => 2 },
+ mentions_count: 0,
+ participating_count: 0,
+ unattended_count: 2,
+ folders: {}
+ )
expect(store.assignment_ready?(account.id)).to be(false)
end
@@ -37,14 +43,21 @@ RSpec.describe Conversations::UnreadCounts::Counter do
account_user.update!(custom_role: create(:custom_role, account: account, permissions: ['conversation_unassigned_manage']))
create_unread_conversation(account: account, inbox: inbox, labels: [label.title], assignee: agent, team: team)
create_unread_conversation(account: account, inbox: inbox, labels: [label.title], team: team)
- create_unread_conversation(account: account, inbox: inbox, labels: [label.title], assignee: other_agent, team: team)
+ other_assigned_conversation = create_unread_conversation(account: account, inbox: inbox, labels: [label.title], assignee: other_agent, team: team)
+ create(:conversation_participant, account: account, conversation: other_assigned_conversation, user: agent)
result = described_class.new(account: account, user: agent).perform
- expect(result[:all_count]).to eq(2)
- expect(result[:inboxes]).to eq(inbox.id.to_s => 2)
- expect(result[:labels]).to eq(label.id.to_s => 2)
- expect(result[:teams]).to eq(team.id.to_s => 2)
+ expect(result).to eq(
+ all_count: 2,
+ inboxes: { inbox.id.to_s => 2 },
+ labels: { label.id.to_s => 2 },
+ teams: { team.id.to_s => 2 },
+ mentions_count: 0,
+ participating_count: 0,
+ unattended_count: 2,
+ folders: {}
+ )
expect(store.assignment_ready?(account.id)).to be(true)
end
@@ -52,13 +65,21 @@ RSpec.describe Conversations::UnreadCounts::Counter do
account_user.update!(custom_role: create(:custom_role, account: account, permissions: ['conversation_participating_manage']))
create_unread_conversation(account: account, inbox: inbox, labels: [label.title], assignee: agent, team: team)
create_unread_conversation(account: account, inbox: inbox, labels: [label.title], team: team)
+ participating_conversation = create_unread_conversation(account: account, inbox: inbox, labels: [label.title], team: team)
+ create(:conversation_participant, account: account, conversation: participating_conversation, user: agent)
result = described_class.new(account: account, user: agent).perform
- expect(result[:all_count]).to eq(1)
- expect(result[:inboxes]).to eq(inbox.id.to_s => 1)
- expect(result[:labels]).to eq(label.id.to_s => 1)
- expect(result[:teams]).to eq(team.id.to_s => 1)
+ expect(result).to eq(
+ all_count: 1,
+ inboxes: { inbox.id.to_s => 1 },
+ labels: { label.id.to_s => 1 },
+ teams: { team.id.to_s => 1 },
+ mentions_count: 0,
+ participating_count: 1,
+ unattended_count: 1,
+ folders: {}
+ )
expect(store.assignment_ready?(account.id)).to be(true)
end
@@ -68,7 +89,16 @@ RSpec.describe Conversations::UnreadCounts::Counter do
result = described_class.new(account: account, user: agent).perform
- expect(result).to eq(all_count: 0, inboxes: {}, labels: {}, teams: {})
+ expect(result).to eq(
+ all_count: 0,
+ inboxes: {},
+ labels: {},
+ teams: {},
+ mentions_count: 0,
+ participating_count: 0,
+ unattended_count: 0,
+ folders: {}
+ )
expect(store.base_ready?(account.id)).to be(false)
expect(store.assignment_ready?(account.id)).to be(false)
end
diff --git a/spec/finders/conversation_finder_spec.rb b/spec/finders/conversation_finder_spec.rb
index 64f134fe2..31cbceb6a 100644
--- a/spec/finders/conversation_finder_spec.rb
+++ b/spec/finders/conversation_finder_spec.rb
@@ -208,6 +208,25 @@ describe ConversationFinder do
end
end
+ context 'with participating conversation type' do
+ let(:params) { { status: 'open', conversation_type: 'participating' } }
+
+ it 'does not return participating conversations from inboxes where the agent is no longer a member' do
+ visible_conversation = create(:conversation, account: account, inbox: inbox)
+ inaccessible_conversation = create(:conversation, account: account, inbox: restricted_inbox)
+ create(:inbox_member, user: user_1, inbox: restricted_inbox)
+ create(:conversation_participant, account: account, conversation: visible_conversation, user: user_1)
+ create(:conversation_participant, account: account, conversation: inaccessible_conversation, user: user_1)
+ InboxMember.find_by!(user: user_1, inbox: restricted_inbox).destroy!
+
+ result = conversation_finder.perform
+ conversation_ids = result[:conversations].map(&:id)
+
+ expect(conversation_ids).to include(visible_conversation.id)
+ expect(conversation_ids).not_to include(inaccessible_conversation.id)
+ end
+ end
+
context 'without source' do
let(:params) { {} }
diff --git a/spec/listeners/action_cable_listener_spec.rb b/spec/listeners/action_cable_listener_spec.rb
index cdb9a93cb..7a774dbd5 100644
--- a/spec/listeners/action_cable_listener_spec.rb
+++ b/spec/listeners/action_cable_listener_spec.rb
@@ -294,5 +294,19 @@ describe ActionCableListener do
listener.conversation_unread_count_changed(event)
end
+
+ it 'supports user-scoped unread count refresh events' do
+ event = Events::Base.new(event_name, Time.zone.now, account: account, user: agent)
+
+ expect(ActionCableBroadcastJob).to receive(:perform_later).with(
+ a_collection_containing_exactly(agent.pubsub_token),
+ 'conversation.unread_count_changed',
+ {
+ account_id: account.id
+ }
+ )
+
+ listener.conversation_unread_count_changed(event)
+ end
end
end
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 38ca9694a..d77a16fdb 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -53,38 +53,79 @@ RSpec.describe Account do
describe 'conversation unread counts feature flag' do
let(:account) { create(:account) }
let(:inbox) { create(:inbox, account: account) }
+ let(:user) { create(:user) }
let(:store) { Conversations::UnreadCounts::Store }
let(:inbox_key) { store.inbox_key(account.id, inbox.id) }
-
- after do
- store.clear_account!(account.id)
+ let(:filter_keys) do
+ [
+ store.user_mentions_key(account.id, user.id),
+ store.user_participating_key(account.id, user.id),
+ store.user_unattended_key(account.id, user.id),
+ store.user_folder_key(account.id, user.id, 1)
+ ]
end
- it 'clears unread count cache when the feature is enabled' do
+ after do
+ store.clear_all_account!(account.id)
+ end
+
+ it 'clears all unread count cache when the feature is enabled' do
build_unread_count_cache
account.enable_features!(:conversation_unread_counts)
- expect(store.base_ready?(account.id)).to be(false)
- expect(store.assignment_ready?(account.id)).to be(false)
- expect(store.counts_for_keys([inbox_key])).to eq(inbox_key => 0)
+ expect_unread_count_cache_cleared
end
- it 'clears unread count cache when the feature is disabled' do
+ it 'clears all unread count cache when the feature is disabled' do
account.enable_features!(:conversation_unread_counts)
build_unread_count_cache
account.disable_features!(:conversation_unread_counts)
- expect(store.base_ready?(account.id)).to be(false)
- expect(store.assignment_ready?(account.id)).to be(false)
- expect(store.counts_for_keys([inbox_key])).to eq(inbox_key => 0)
+ expect_unread_count_cache_cleared
+ end
+
+ it 'clears all unread count cache when account cache keys are reset' do
+ build_unread_count_cache
+
+ account.reset_cache_keys
+
+ expect_unread_count_cache_cleared
+ end
+
+ def expect_unread_count_cache_cleared
+ expect(unread_count_ready_markers).to all(be(false))
+ expect(store.counts_for_keys(unread_count_keys).values).to all(eq(0))
+ end
+
+ def unread_count_ready_markers
+ [
+ store.base_ready?(account.id),
+ store.assignment_ready?(account.id),
+ store.filters_ready?(account.id, user.id)
+ ]
+ end
+
+ def unread_count_keys
+ [inbox_key] + filter_keys
end
def build_unread_count_cache
store.mark_base_ready!(account.id)
store.mark_assignment_ready!(account.id)
+ store.mark_filters_ready!(account.id, user.id)
store.add_base_membership(account_id: account.id, inbox_id: inbox.id, label_ids: [], conversation_id: 1)
+ store.add_filter_memberships(
+ account_id: account.id,
+ user_id: user.id,
+ filters: {
+ mentions: [1],
+ participating: [2],
+ unattended: [3]
+ },
+ folders: { 1 => [4] }
+ )
end
end
diff --git a/spec/models/account_user_spec.rb b/spec/models/account_user_spec.rb
index e5a560fe9..7acfc19cd 100644
--- a/spec/models/account_user_spec.rb
+++ b/spec/models/account_user_spec.rb
@@ -42,4 +42,32 @@ RSpec.describe AccountUser do
expect(user.assigned_conversations.count).to eq(0)
end
end
+
+ describe 'unread filter count invalidation' do
+ let(:notifier) { instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true) }
+
+ before do
+ allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
+ end
+
+ it 'notifies when the account role changes' do
+ account_user.update!(role: :administrator)
+
+ expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(
+ account: account_user.account,
+ user: account_user.user
+ )
+ expect(notifier).to have_received(:perform)
+ end
+
+ it 'notifies when account access is removed' do
+ expect(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).with(
+ account: account_user.account,
+ user: account_user.user
+ ).and_return(notifier)
+ expect(notifier).to receive(:perform)
+
+ account_user.destroy!
+ end
+ end
end
diff --git a/spec/models/inbox_member_spec.rb b/spec/models/inbox_member_spec.rb
index b081c546c..df569c695 100644
--- a/spec/models/inbox_member_spec.rb
+++ b/spec/models/inbox_member_spec.rb
@@ -18,4 +18,30 @@ RSpec.describe InboxMember do
end
end
end
+
+ describe 'unread filter count invalidation' do
+ let(:account) { create(:account) }
+ let(:inbox) { create(:inbox, account: account) }
+ let(:user) { create(:user, account: account, role: :agent) }
+ let(:notifier) { instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true) }
+
+ before do
+ allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
+ end
+
+ it 'notifies when inbox access is added' do
+ create(:inbox_member, inbox: inbox, user: user)
+
+ expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(account: account, user: user)
+ expect(notifier).to have_received(:perform)
+ end
+
+ it 'notifies when inbox access is removed' do
+ inbox_member = create(:inbox_member, inbox: inbox, user: user)
+ expect(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).with(account: account, user: user).and_return(notifier)
+ expect(notifier).to receive(:perform)
+
+ inbox_member.destroy!
+ end
+ end
end
diff --git a/spec/services/conversations/unread_counts/builder_spec.rb b/spec/services/conversations/unread_counts/builder_spec.rb
index 4b3aec230..fe1bdb6fa 100644
--- a/spec/services/conversations/unread_counts/builder_spec.rb
+++ b/spec/services/conversations/unread_counts/builder_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Conversations::UnreadCounts::Builder do
let(:store) { Conversations::UnreadCounts::Store }
after do
- store.clear_account!(account.id)
+ store.clear_all_account!(account.id)
end
describe '#build_base!' do
@@ -75,6 +75,173 @@ RSpec.describe Conversations::UnreadCounts::Builder do
end
end
+ describe '#build_filters_for!' do
+ before do
+ create(:inbox_member, user: assignee, inbox: inbox)
+ end
+
+ it 'stores unread open conversations by mentions and participating dimensions' do
+ mentioned_conversation = create_unread_conversation(account: account, inbox: inbox)
+ participating_conversation = create_unread_conversation(account: account, inbox: inbox)
+ resolved_mentioned_conversation = create_unread_conversation(account: account, inbox: inbox)
+ inaccessible_conversation = create_unread_conversation(account: account, inbox: create(:inbox, account: account))
+ resolved_mentioned_conversation.update!(status: :resolved)
+
+ create(:mention, account: account, conversation: mentioned_conversation, user: assignee)
+ create(:mention, account: account, conversation: resolved_mentioned_conversation, user: assignee)
+ create(:mention, account: account, conversation: inaccessible_conversation, user: assignee)
+ create(:conversation_participant, account: account, conversation: participating_conversation, user: assignee)
+
+ described_class.new(account).build_filters_for!(assignee)
+
+ expect(store.filters_ready?(account.id, assignee.id)).to be(true)
+ expect(redis_set_members(store.user_mentions_key(account.id, assignee.id))).to contain_exactly(mentioned_conversation.id.to_s)
+ expect(redis_set_members(store.user_participating_key(account.id, assignee.id))).to contain_exactly(participating_conversation.id.to_s)
+ end
+
+ it 'excludes participating conversations that are no longer visible to the user' do
+ participating_conversation = create_unread_conversation(account: account, inbox: inbox)
+ create(:conversation_participant, account: account, conversation: participating_conversation, user: assignee)
+ InboxMember.find_by!(user: assignee, inbox: inbox).destroy!
+
+ described_class.new(account).build_filters_for!(assignee)
+
+ expect(redis_set_members(store.user_participating_key(account.id, assignee.id))).to be_empty
+ end
+
+ it 'stores visible unread open unattended conversations' do
+ no_first_reply_conversation = create_unread_conversation(account: account, inbox: inbox)
+ waiting_conversation = create_unread_conversation(account: account, inbox: inbox)
+ attended_conversation = create_unread_conversation(account: account, inbox: inbox)
+ inaccessible_conversation = create_unread_conversation(account: account, inbox: create(:inbox, account: account))
+ resolved_conversation = create_unread_conversation(account: account, inbox: inbox)
+ create_read_conversation
+
+ waiting_conversation.update!(first_reply_created_at: 5.minutes.ago)
+ attended_conversation.update!(first_reply_created_at: 5.minutes.ago, waiting_since: nil)
+ inaccessible_conversation.update!(first_reply_created_at: nil)
+ resolved_conversation.update!(status: :resolved)
+
+ described_class.new(account).build_filters_for!(assignee)
+
+ expect(redis_set_members(store.user_unattended_key(account.id, assignee.id))).to contain_exactly(
+ no_first_reply_conversation.id.to_s,
+ waiting_conversation.id.to_s
+ )
+ end
+
+ it 'stores folder memberships using the saved filter status conditions' do
+ resolved_conversation = create_unread_conversation(account: account, inbox: inbox)
+ resolved_conversation.update!(status: :resolved)
+ create_unread_conversation(account: account, inbox: inbox, assignee: assignee)
+ custom_filter = create(
+ :custom_filter, account: account, user: assignee, filter_type: :conversation, query: filter_query('status', ['resolved'])
+ )
+
+ described_class.new(account).build_filters_for!(assignee)
+
+ expect(redis_set_members(store.user_folder_key(account.id, assignee.id, custom_filter.id))).to contain_exactly(resolved_conversation.id.to_s)
+ end
+
+ it 'loads folder filters after taking the invalidation version snapshot' do
+ create_unread_conversation(account: account, inbox: inbox)
+ resolved_conversation = create_unread_conversation(account: account, inbox: inbox)
+ resolved_conversation.update!(status: :resolved)
+ custom_filter = create(
+ :custom_filter, account: account, user: assignee, filter_type: :conversation, query: filter_query('status', ['open'])
+ )
+ notifier = instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true)
+ allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
+ filter_updated = false
+ allow(store).to receive(:filter_version_snapshot).and_wrap_original do |method, *args|
+ method.call(*args).tap do
+ next if filter_updated
+
+ filter_updated = true
+ custom_filter.update!(query: filter_query('status', ['resolved']))
+ end
+ end
+
+ described_class.new(account).build_filters_for!(assignee)
+
+ expect(redis_set_members(store.user_folder_key(account.id, assignee.id, custom_filter.id))).to contain_exactly(resolved_conversation.id.to_s)
+ end
+
+ it 'expires relative-date folder caches at the next date boundary' do
+ create(
+ :custom_filter,
+ account: account,
+ user: assignee,
+ filter_type: :conversation,
+ query: filter_query('created_at', [7], filter_operator: 'days_before')
+ )
+ allow(store).to receive(:mark_filters_ready_if_current!).and_call_original
+ expected_ttl = nil
+
+ travel_to Time.zone.local(2026, 1, 1, 9, 30, 0) do
+ expected_ttl = (Time.zone.tomorrow.beginning_of_day - Time.current).ceil
+ described_class.new(account).build_filters_for!(assignee)
+ end
+
+ expect(store).to have_received(:mark_filters_ready_if_current!).with(
+ account.id,
+ assignee.id,
+ version_snapshot: kind_of(Hash),
+ expires_in: expected_ttl
+ )
+ end
+
+ it 'does not mark filters ready when user filters are invalidated during the build' do
+ conversation = create_unread_conversation(account: account, inbox: inbox)
+ create(:mention, account: account, conversation: conversation, user: assignee)
+ clear_user_filters_after_membership_write
+
+ described_class.new(account).build_filters_for!(assignee)
+
+ expect(store.filters_ready?(account.id, assignee.id)).to be(false)
+ expect(redis_set_members(store.user_mentions_key(account.id, assignee.id))).to be_empty
+ end
+
+ it 'does not mark filters ready when account filters are invalidated during the build' do
+ conversation = create_unread_conversation(account: account, inbox: inbox)
+ create(:mention, account: account, conversation: conversation, user: assignee)
+ clear_filter_caches_after_membership_write
+
+ described_class.new(account).build_filters_for!(assignee)
+
+ expect(store.filters_ready?(account.id, assignee.id)).to be(false)
+ expect(redis_set_members(store.user_mentions_key(account.id, assignee.id))).to be_empty
+ end
+
+ it 'skips invalid folder filters and still marks the user filter cache ready' do
+ create_unread_conversation(account: account, inbox: inbox)
+ invalid_filter = create(
+ :custom_filter, account: account, user: assignee, filter_type: :conversation, query: filter_query('missing_attribute', ['open'])
+ )
+
+ described_class.new(account).build_filters_for!(assignee)
+
+ expect(store.filters_ready?(account.id, assignee.id)).to be(true)
+ expect(redis_set_members(store.user_folder_key(account.id, assignee.id, invalid_filter.id))).to be_empty
+ end
+
+ it 'skips folder filters that fail when the SQL query is executed' do
+ conversation = create_unread_conversation(account: account, inbox: inbox)
+ invalid_filter = create(
+ :custom_filter,
+ account: account,
+ user: assignee,
+ filter_type: :conversation,
+ query: filter_query('display_id', [conversation.display_id.to_s], filter_operator: 'contains')
+ )
+
+ expect { described_class.new(account).build_filters_for!(assignee) }.not_to raise_error
+
+ expect(store.filters_ready?(account.id, assignee.id)).to be(true)
+ expect(redis_set_members(store.user_folder_key(account.id, assignee.id, invalid_filter.id))).to be_empty
+ end
+ end
+
def create_read_conversation
conversation = create(:conversation, account: account, inbox: inbox, agent_last_seen_at: 1.minute.from_now)
create(:message, account: account, inbox: inbox, conversation: conversation, message_type: :incoming)
@@ -90,4 +257,32 @@ RSpec.describe Conversations::UnreadCounts::Builder do
def redis_set_members(key)
Redis::Alfred.pipelined { |pipeline| pipeline.smembers(key) }.first
end
+
+ def clear_user_filters_after_membership_write
+ allow(store).to receive(:add_filter_memberships).and_wrap_original do |method, *args, **kwargs|
+ method.call(*args, **kwargs)
+ store.clear_user_filters!(account.id, assignee.id)
+ end
+ end
+
+ def clear_filter_caches_after_membership_write
+ allow(store).to receive(:add_filter_memberships).and_wrap_original do |method, *args, **kwargs|
+ method.call(*args, **kwargs)
+ store.clear_filter_caches!(account.id)
+ end
+ end
+
+ def filter_query(attribute_key, values, filter_operator: 'equal_to')
+ {
+ payload: [
+ {
+ attribute_key: attribute_key,
+ filter_operator: filter_operator,
+ values: values,
+ query_operator: nil,
+ custom_attribute_type: ''
+ }
+ ]
+ }
+ end
end
diff --git a/spec/services/conversations/unread_counts/counter_spec.rb b/spec/services/conversations/unread_counts/counter_spec.rb
index 723f2d437..c3c338355 100644
--- a/spec/services/conversations/unread_counts/counter_spec.rb
+++ b/spec/services/conversations/unread_counts/counter_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Conversations::UnreadCounts::Counter do
end
after do
- store.clear_account!(account.id)
+ store.clear_all_account!(account.id)
end
it 'builds the base cache on demand' do
@@ -32,6 +32,7 @@ RSpec.describe Conversations::UnreadCounts::Counter do
lock_key = "UNREAD_CONVERSATIONS::V1::ACCOUNT::#{account.id}::BUILD_LOCK::BASE"
lock_manager = instance_double(Redis::LockManager)
allow(Redis::LockManager).to receive(:new).and_return(lock_manager)
+ allow(lock_manager).to receive(:with_lock).and_yield.and_return(true)
allow(lock_manager).to receive(:with_lock).with(lock_key, described_class::BUILD_LOCK_TTL).and_yield.and_return(true)
create_unread_conversation(account: account, inbox: visible_inbox, labels: [label.title], team: visible_team)
@@ -46,13 +47,33 @@ RSpec.describe Conversations::UnreadCounts::Counter do
counter = described_class.new(account: account, user: agent)
allow(Redis::LockManager).to receive(:new).and_return(lock_manager)
- allow(counter).to receive(:wait_for_cache_ready) { store.mark_base_ready!(account.id) }
+ allow(counter).to receive(:wait_for_cache_ready) do
+ store.mark_base_ready!(account.id)
+ store.mark_filters_ready!(account.id, agent.id)
+ end
expect(Conversations::UnreadCounts::Builder).not_to receive(:new)
counter.perform
expect(counter).to have_received(:wait_for_cache_ready)
expect(store.base_ready?(account.id)).to be(true)
+ expect(store.filters_ready?(account.id, agent.id)).to be(true)
+ end
+
+ it 'retries when a build finishes without marking the cache ready' do
+ builder = instance_double(Conversations::UnreadCounts::Builder)
+ attempts = 0
+ allow(Conversations::UnreadCounts::Builder).to receive(:new).and_return(builder)
+ allow(builder).to receive(:build_base!) do
+ attempts += 1
+ store.mark_base_ready!(account.id) if attempts == 2
+ end
+ allow(builder).to receive(:build_filters_for!) { store.mark_filters_ready!(account.id, agent.id) }
+
+ described_class.new(account: account, user: agent).perform
+
+ expect(builder).to have_received(:build_base!).twice
+ expect(store.base_ready?(account.id)).to be(true)
end
it 'counts unread conversations only across inboxes visible to a normal agent' do
@@ -65,7 +86,11 @@ RSpec.describe Conversations::UnreadCounts::Counter do
all_count: 1,
inboxes: { visible_inbox.id.to_s => 1 },
labels: { label.id.to_s => 1 },
- teams: { visible_team.id.to_s => 1 }
+ teams: { visible_team.id.to_s => 1 },
+ mentions_count: 0,
+ participating_count: 0,
+ unattended_count: 1,
+ folders: {}
)
end
@@ -79,7 +104,11 @@ RSpec.describe Conversations::UnreadCounts::Counter do
all_count: 2,
inboxes: { visible_inbox.id.to_s => 1, hidden_inbox.id.to_s => 1 },
labels: { label.id.to_s => 2 },
- teams: { visible_team.id.to_s => 2 }
+ teams: { visible_team.id.to_s => 2 },
+ mentions_count: 0,
+ participating_count: 0,
+ unattended_count: 2,
+ folders: {}
)
end
@@ -92,7 +121,46 @@ RSpec.describe Conversations::UnreadCounts::Counter do
all_count: 1,
inboxes: { visible_inbox.id.to_s => 1 },
labels: {},
- teams: { visible_team.id.to_s => 1 }
+ teams: { visible_team.id.to_s => 1 },
+ mentions_count: 0,
+ participating_count: 0,
+ unattended_count: 1,
+ folders: {}
)
end
+
+ it 'returns mention, participating, unattended, and valid folder unread counts for the user' do
+ mentioned_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
+ participating_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
+ resolved_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
+ resolved_conversation.update!(status: :resolved)
+ valid_folder = create(:custom_filter, account: account, user: agent, filter_type: :conversation, query: filter_query('status', ['resolved']))
+ invalid_folder = create(:custom_filter, account: account, user: agent, filter_type: :conversation, query: filter_query('unknown', ['open']))
+
+ create(:mention, account: account, conversation: mentioned_conversation, user: agent)
+ create(:conversation_participant, account: account, conversation: participating_conversation, user: agent)
+
+ result = described_class.new(account: account, user: agent).perform
+
+ expect(result[:mentions_count]).to eq(1)
+ expect(result[:participating_count]).to eq(1)
+ expect(result[:unattended_count]).to eq(2)
+ expect(result[:folders]).to eq(valid_folder.id.to_s => 1)
+ expect(result[:folders]).not_to have_key(invalid_folder.id.to_s)
+ expect(store.filters_ready?(account.id, agent.id)).to be(true)
+ end
+
+ def filter_query(attribute_key, values)
+ {
+ payload: [
+ {
+ attribute_key: attribute_key,
+ filter_operator: 'equal_to',
+ values: values,
+ query_operator: nil,
+ custom_attribute_type: ''
+ }
+ ]
+ }
+ end
end
diff --git a/spec/services/conversations/unread_counts/listener_spec.rb b/spec/services/conversations/unread_counts/listener_spec.rb
index fbb0a0835..0cf31bd3c 100644
--- a/spec/services/conversations/unread_counts/listener_spec.rb
+++ b/spec/services/conversations/unread_counts/listener_spec.rb
@@ -21,13 +21,22 @@ RSpec.describe Conversations::UnreadCounts::Listener do
expect(notifier).to have_received(:perform)
end
- it 'ignores outgoing message creation' do
+ it 'clears user filter counts when a non-incoming message updates last activity' do
+ account.enable_features!(:conversation_unread_counts)
message = create(:message, account: account, inbox: conversation.inbox, conversation: conversation, message_type: :outgoing)
event = Events::Base.new('message.created', Time.zone.now, message: message)
+ allow(store).to receive(:clear_filter_caches!).and_return(true)
+ allow(Rails.configuration.dispatcher).to receive(:dispatch)
listener.message_created(event)
expect(Conversations::UnreadCounts::Notifier).not_to have_received(:new)
+ expect(store).to have_received(:clear_filter_caches!).with(account.id)
+ expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
+ 'conversation.unread_count_changed',
+ kind_of(Time),
+ conversation: conversation
+ )
end
it 'ignores incoming message creation when conversation unread counts are disabled' do
@@ -52,6 +61,7 @@ RSpec.describe Conversations::UnreadCounts::Listener do
end
it 'refreshes unread counts when labels change' do
+ account.enable_features!(:conversation_unread_counts)
changed_attributes = { label_list: [%w[old], %w[new]] }
event = Events::Base.new('conversation.updated', Time.zone.now, conversation: conversation, changed_attributes: changed_attributes)
@@ -61,8 +71,43 @@ RSpec.describe Conversations::UnreadCounts::Listener do
expect(notifier).to have_received(:perform)
end
- it 'ignores conversation updates unrelated to unread count dimensions' do
+ it 'clears user filter counts when a folder filter dimension changes' do
+ account.enable_features!(:conversation_unread_counts)
event = Events::Base.new('conversation.updated', Time.zone.now, conversation: conversation, changed_attributes: { priority: [nil, 'high'] })
+ allow(store).to receive(:clear_filter_caches!).and_return(true)
+ allow(Rails.configuration.dispatcher).to receive(:dispatch)
+
+ listener.conversation_updated(event)
+
+ expect(Conversations::UnreadCounts::Notifier).not_to have_received(:new)
+ expect(store).to have_received(:clear_filter_caches!).with(account.id)
+ expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
+ 'conversation.unread_count_changed',
+ kind_of(Time),
+ conversation: conversation
+ )
+ end
+
+ it 'clears user filter counts when the conversation contact changes' do
+ account.enable_features!(:conversation_unread_counts)
+ event = Events::Base.new('conversation.contact_changed', Time.zone.now, conversation: conversation)
+ allow(store).to receive(:clear_filter_caches!).and_return(true)
+ allow(Rails.configuration.dispatcher).to receive(:dispatch)
+
+ listener.conversation_contact_changed(event)
+
+ expect(Conversations::UnreadCounts::Notifier).not_to have_received(:new)
+ expect(store).to have_received(:clear_filter_caches!).with(account.id)
+ expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
+ 'conversation.unread_count_changed',
+ kind_of(Time),
+ conversation: conversation
+ )
+ end
+
+ it 'ignores conversation updates without changed attributes' do
+ account.enable_features!(:conversation_unread_counts)
+ event = Events::Base.new('conversation.updated', Time.zone.now, conversation: conversation, changed_attributes: {})
listener.conversation_updated(event)
@@ -128,7 +173,7 @@ RSpec.describe Conversations::UnreadCounts::Listener do
conversation_data: conversation_data.stringify_keys
)
ensure
- store.clear_account!(account.id)
+ store.clear_all_account!(account.id)
end
def deleted_conversation_data(conversation)
diff --git a/spec/services/conversations/unread_counts/notifier_spec.rb b/spec/services/conversations/unread_counts/notifier_spec.rb
index 1b35d37f6..645c2bc17 100644
--- a/spec/services/conversations/unread_counts/notifier_spec.rb
+++ b/spec/services/conversations/unread_counts/notifier_spec.rb
@@ -29,6 +29,18 @@ RSpec.describe Conversations::UnreadCounts::Notifier do
expect(Rails.configuration.dispatcher).not_to have_received(:dispatch)
end
+
+ it 'dispatches unread count changed event when user filter caches were cleared' do
+ allow(Conversations::UnreadCounts::Store).to receive(:clear_filter_caches!).and_return(true)
+
+ described_class.new(conversation).perform
+
+ expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
+ 'conversation.unread_count_changed',
+ kind_of(Time),
+ conversation: conversation
+ )
+ end
end
context 'when conversation unread counts feature is disabled' do
diff --git a/spec/services/conversations/unread_counts/refresher_spec.rb b/spec/services/conversations/unread_counts/refresher_spec.rb
index 5f361e7aa..e961c21c3 100644
--- a/spec/services/conversations/unread_counts/refresher_spec.rb
+++ b/spec/services/conversations/unread_counts/refresher_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Conversations::UnreadCounts::Refresher do
let(:store) { Conversations::UnreadCounts::Store }
after do
- store.clear_account!(account.id)
+ store.clear_all_account!(account.id)
end
it 'does not update redis when unread caches are not ready' do
diff --git a/spec/services/conversations/unread_counts/store_spec.rb b/spec/services/conversations/unread_counts/store_spec.rb
index fcf21c985..9e1311727 100644
--- a/spec/services/conversations/unread_counts/store_spec.rb
+++ b/spec/services/conversations/unread_counts/store_spec.rb
@@ -7,9 +7,10 @@ RSpec.describe Conversations::UnreadCounts::Store do
let(:user_id) { 4 }
let(:conversation_id) { 5 }
let(:team_id) { 6 }
+ let(:other_user_id) { 8 }
after do
- described_class.clear_account!(account_id)
+ described_class.clear_all_account!(account_id)
end
describe 'key builders' do
@@ -45,20 +46,69 @@ RSpec.describe Conversations::UnreadCounts::Store do
'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::TEAM::6::INBOX::2::ASSIGNEE::4'
)
end
+
+ it 'builds user filter keys using the Redis key naming convention' do
+ expect(described_class.user_mentions_key(account_id, user_id)).to eq(
+ 'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::MENTIONS'
+ )
+ expect(described_class.user_participating_key(account_id, user_id)).to eq(
+ 'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::PARTICIPATING'
+ )
+ expect(described_class.user_unattended_key(account_id, user_id)).to eq(
+ 'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::UNATTENDED'
+ )
+ expect(described_class.user_folder_key(account_id, user_id, 7)).to eq(
+ 'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::FOLDER::7'
+ )
+ end
end
describe 'ready markers' do
- it 'tracks base and assignment readiness independently' do
+ it 'starts with all ready markers missing' do
expect(described_class.base_ready?(account_id)).to be(false)
expect(described_class.assignment_ready?(account_id)).to be(false)
+ expect(described_class.filters_ready?(account_id, user_id)).to be(false)
+ end
+ it 'tracks base, assignment, and user filter readiness independently' do
described_class.mark_base_ready!(account_id)
described_class.mark_assignment_ready!(account_id)
+ described_class.mark_filters_ready!(account_id, user_id)
expect(described_class.base_ready?(account_id)).to be(true)
expect(described_class.assignment_ready?(account_id)).to be(true)
+ expect(described_class.filters_ready?(account_id, user_id)).to be(true)
expect(ttl_for('UNREAD_CONVERSATIONS::V1::ACCOUNT::1::READY::BASE')).to be_within(5).of(Conversations::UnreadCounts::READY_TTL)
expect(ttl_for('UNREAD_CONVERSATIONS::V1::ACCOUNT::1::READY::ASSIGNMENT')).to be_within(5).of(Conversations::UnreadCounts::READY_TTL)
+ expect(ttl_for('UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::READY::FILTERS')).to be_within(5).of(
+ Conversations::UnreadCounts::READY_TTL
+ )
+ end
+
+ it 'tracks filter invalidation versions independently' do
+ expect(described_class.filter_version_snapshot(account_id, user_id)).to eq(account: 0, user: 0)
+
+ expect(described_class.clear_user_filters!(account_id, user_id)).to be(false)
+
+ expect(described_class.filter_version_snapshot(account_id, user_id)).to eq(account: 0, user: 1)
+ expect(ttl_for(user_filter_version_key)).to be_within(5).of(Conversations::UnreadCounts::SET_TTL)
+
+ expect(described_class.clear_filter_caches!(account_id)).to be(false)
+
+ expect(described_class.filter_version_snapshot(account_id, user_id)).to eq(account: 1, user: 1)
+ expect(ttl_for(account_filter_version_key)).to be_within(5).of(Conversations::UnreadCounts::SET_TTL)
+ end
+
+ it 'marks filter caches ready only when the invalidation version is current' do
+ version_snapshot = described_class.filter_version_snapshot(account_id, user_id)
+
+ expect(described_class.mark_filters_ready_if_current!(account_id, user_id, version_snapshot: version_snapshot)).to be_truthy
+ expect(described_class.filters_ready?(account_id, user_id)).to be(true)
+
+ described_class.clear_user_filters!(account_id, user_id)
+
+ expect(described_class.mark_filters_ready_if_current!(account_id, user_id, version_snapshot: version_snapshot)).to be(false)
+ expect(described_class.filters_ready?(account_id, user_id)).to be(false)
end
end
@@ -150,9 +200,94 @@ RSpec.describe Conversations::UnreadCounts::Store do
expect(base_keys.map { |key| ttl_for(key) }).to all(be_within(5).of(Conversations::UnreadCounts::SET_TTL))
end
- it 'clears all account memberships' do
+ it 'adds, counts, and clears user filter memberships' do
+ described_class.add_filter_memberships(
+ account_id: account_id,
+ user_id: user_id,
+ filters: {
+ mentions: [conversation_id],
+ participating: [conversation_id],
+ unattended: [conversation_id]
+ },
+ folders: { 7 => [conversation_id] }
+ )
+ described_class.mark_filters_ready!(account_id, user_id)
+
+ expect(described_class.counts_for_keys(user_filter_keys)).to eq(
+ described_class.user_mentions_key(account_id, user_id) => 1,
+ described_class.user_participating_key(account_id, user_id) => 1,
+ described_class.user_unattended_key(account_id, user_id) => 1,
+ described_class.user_folder_key(account_id, user_id, 7) => 1
+ )
+ expect(user_filter_keys.map { |key| ttl_for(key) }).to all(be_within(5).of(Conversations::UnreadCounts::SET_TTL))
+
+ expect(described_class.clear_user_filters!(account_id, user_id)).to be(true)
+
+ expect(described_class.filters_ready?(account_id, user_id)).to be(false)
+ expect(described_class.counts_for_keys(user_filter_keys).values).to all(eq(0))
+ end
+
+ it 'preserves the user filter build lock when clearing one user filter cache' do
+ described_class.add_filter_memberships(
+ account_id: account_id,
+ user_id: user_id,
+ filters: {
+ mentions: [conversation_id],
+ participating: [conversation_id],
+ unattended: [conversation_id]
+ },
+ folders: { 7 => [conversation_id] }
+ )
+ described_class.mark_filters_ready!(account_id, user_id)
+ Redis::Alfred.set(user_filter_build_lock_key, 'locked')
+
+ expect(described_class.clear_user_filters!(account_id, user_id)).to be(true)
+
+ expect(Redis::Alfred.exists?(user_filter_build_lock_key)).to be(true)
+ expect(described_class.filters_ready?(account_id, user_id)).to be(false)
+ expect(described_class.counts_for_keys(user_filter_keys).values).to all(eq(0))
+ end
+
+ it 'preserves user filter build locks when clearing all account filter caches' do
+ described_class.add_filter_memberships(
+ account_id: account_id,
+ user_id: user_id,
+ filters: {
+ mentions: [conversation_id],
+ participating: [],
+ unattended: []
+ },
+ folders: {}
+ )
+ described_class.add_filter_memberships(
+ account_id: account_id,
+ user_id: other_user_id,
+ filters: {
+ mentions: [conversation_id],
+ participating: [],
+ unattended: []
+ },
+ folders: {}
+ )
+ described_class.mark_filters_ready!(account_id, user_id)
+ described_class.mark_filters_ready!(account_id, other_user_id)
+ Redis::Alfred.set(user_filter_build_lock_key, 'locked')
+ Redis::Alfred.set(user_filter_build_lock_key(other_user_id), 'locked')
+
+ expect(described_class.clear_filter_caches!(account_id)).to be(true)
+
+ expect(Redis::Alfred.exists?(user_filter_build_lock_key)).to be(true)
+ expect(Redis::Alfred.exists?(user_filter_build_lock_key(other_user_id))).to be(true)
+ expect(described_class.filters_ready?(account_id, user_id)).to be(false)
+ expect(described_class.filters_ready?(account_id, other_user_id)).to be(false)
+ expect(described_class.counts_for_keys([described_class.user_mentions_key(account_id, user_id)]).values).to all(eq(0))
+ expect(described_class.counts_for_keys([described_class.user_mentions_key(account_id, other_user_id)]).values).to all(eq(0))
+ end
+
+ it 'clears account memberships without clearing user filter memberships' do
described_class.mark_base_ready!(account_id)
described_class.mark_assignment_ready!(account_id)
+ described_class.mark_filters_ready!(account_id, user_id)
described_class.add_base_membership(
account_id: account_id,
inbox_id: inbox_id,
@@ -168,13 +303,69 @@ RSpec.describe Conversations::UnreadCounts::Store do
team_id: team_id,
conversation_id: conversation_id
)
+ described_class.add_filter_memberships(
+ account_id: account_id,
+ user_id: user_id,
+ filters: {
+ mentions: [conversation_id],
+ participating: [],
+ unattended: []
+ },
+ folders: {}
+ )
+ Redis::Alfred.set(user_filter_build_lock_key, 'locked')
described_class.clear_account!(account_id)
expect(described_class.base_ready?(account_id)).to be(false)
expect(described_class.assignment_ready?(account_id)).to be(false)
+ expect(described_class.filters_ready?(account_id, user_id)).to be(true)
expect(described_class.counts_for_keys(base_keys).values).to all(eq(0))
expect(described_class.counts_for_keys(assignment_keys).values).to all(eq(0))
+ expect(described_class.counts_for_keys([described_class.user_mentions_key(account_id, user_id)]).values).to all(eq(1))
+ expect(Redis::Alfred.exists?(user_filter_build_lock_key)).to be(true)
+ end
+
+ it 'clears all account unread count keys' do
+ described_class.mark_base_ready!(account_id)
+ described_class.mark_assignment_ready!(account_id)
+ described_class.mark_filters_ready!(account_id, user_id)
+ described_class.add_base_membership(
+ account_id: account_id,
+ inbox_id: inbox_id,
+ label_ids: [label_id],
+ team_id: team_id,
+ conversation_id: conversation_id
+ )
+ described_class.add_assignment_membership(
+ account_id: account_id,
+ inbox_id: inbox_id,
+ label_ids: [label_id],
+ assignee_id: user_id,
+ team_id: team_id,
+ conversation_id: conversation_id
+ )
+ described_class.add_filter_memberships(
+ account_id: account_id,
+ user_id: user_id,
+ filters: {
+ mentions: [conversation_id],
+ participating: [],
+ unattended: []
+ },
+ folders: {}
+ )
+ Redis::Alfred.set(user_filter_build_lock_key, 'locked')
+
+ described_class.clear_all_account!(account_id)
+
+ expect(described_class.base_ready?(account_id)).to be(false)
+ expect(described_class.assignment_ready?(account_id)).to be(false)
+ expect(described_class.filters_ready?(account_id, user_id)).to be(false)
+ expect(described_class.counts_for_keys(base_keys).values).to all(eq(0))
+ expect(described_class.counts_for_keys(assignment_keys).values).to all(eq(0))
+ expect(described_class.counts_for_keys([described_class.user_mentions_key(account_id, user_id)]).values).to all(eq(0))
+ expect(Redis::Alfred.exists?(user_filter_build_lock_key)).to be(false)
end
end
@@ -194,6 +385,27 @@ RSpec.describe Conversations::UnreadCounts::Store do
]
end
+ def user_filter_keys(filter_user_id = user_id)
+ [
+ described_class.user_mentions_key(account_id, filter_user_id),
+ described_class.user_participating_key(account_id, filter_user_id),
+ described_class.user_unattended_key(account_id, filter_user_id),
+ described_class.user_folder_key(account_id, filter_user_id, 7)
+ ]
+ end
+
+ def user_filter_build_lock_key(filter_user_id = user_id)
+ format(Redis::Alfred::UNREAD_CONVERSATIONS_USER_FILTERS_BUILD_LOCK, account_id: account_id, user_id: filter_user_id)
+ end
+
+ def account_filter_version_key
+ format(Redis::Alfred::UNREAD_CONVERSATIONS_FILTERS_VERSION, account_id: account_id)
+ end
+
+ def user_filter_version_key(filter_user_id = user_id)
+ format(Redis::Alfred::UNREAD_CONVERSATIONS_USER_FILTERS_VERSION, account_id: account_id, user_id: filter_user_id)
+ end
+
def ttl_for(key)
Redis::Alfred.ttl(key)
end
diff --git a/spec/services/conversations/unread_counts/user_filter_notifier_spec.rb b/spec/services/conversations/unread_counts/user_filter_notifier_spec.rb
new file mode 100644
index 000000000..1d898b103
--- /dev/null
+++ b/spec/services/conversations/unread_counts/user_filter_notifier_spec.rb
@@ -0,0 +1,37 @@
+require 'rails_helper'
+
+RSpec.describe Conversations::UnreadCounts::UserFilterNotifier do
+ let(:account) { create(:account) }
+ let(:user) { create(:user, account: account) }
+ let(:store) { Conversations::UnreadCounts::Store }
+
+ after do
+ store.clear_all_account!(account.id)
+ end
+
+ it 'clears the user filter cache and dispatches an unread count refresh event' do
+ account.enable_features!(:conversation_unread_counts)
+ store.mark_filters_ready!(account.id, user.id)
+ allow(Rails.configuration.dispatcher).to receive(:dispatch)
+
+ described_class.new(account: account, user: user).perform
+
+ expect(store.filters_ready?(account.id, user.id)).to be(false)
+ expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
+ 'conversation.unread_count_changed',
+ kind_of(Time),
+ account: account,
+ user: user
+ )
+ end
+
+ it 'does nothing when conversation unread counts are disabled' do
+ store.mark_filters_ready!(account.id, user.id)
+ allow(Rails.configuration.dispatcher).to receive(:dispatch)
+
+ described_class.new(account: account, user: user).perform
+
+ expect(store.filters_ready?(account.id, user.id)).to be(true)
+ expect(Rails.configuration.dispatcher).not_to have_received(:dispatch)
+ end
+end
From c70a57407d4722e878beeccc9ad756fbb2d75810 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan
Date: Wed, 17 Jun 2026 00:05:29 +0530
Subject: [PATCH 17/26] fix: label Chatwoot Mobile sessions instead of 'Unknown
Device' (#14753)
## Description
Sessions created by logins from the Chatwoot Mobile app currently render
as "Unknown Device" in the dashboard sessions UI. The mobile app's HTTP
layer sends:
- Android: `User-Agent: okhttp/4.9.2`
- iOS: `User-Agent: Chatwoot/ CFNetwork/ Darwin/`
Neither pattern is classifiable by the `browser` gem, so
\`browser_name\`, \`platform_name\`, and \`device_name\` all end up
"Unknown".
This change adds a backend-only fallback in
\`UserSessionTrackingService\`. When \`Browser.new(ua)\` returns
"Unknown Browser" and the UA matches a known Chatwoot Mobile pattern,
the labels are overridden to \`Chatwoot Mobile\` + \`Android\` /
\`iPhone\`. The Vue sessions list (\`ActiveSessions.vue\`) then renders
"Chatwoot Mobile on Android" or "Chatwoot Mobile on iPhone" with the
smartphone icon.
This is the immediate floor. A follow-up will add structured
\`X-Chatwoot-*\` headers from the mobile app so we can render full
version + device model.
Fixes INF-75.
## Type of change
- [x] Bug fix (non-breaking change which fixes an issue)
## How Has This Been Tested?
- Added specs
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [x] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [x] Any dependent changes have been merged and published in downstream
modules
---
app/services/user_session_tracking_service.rb | 26 ++++++-
.../user_session_tracking_service_spec.rb | 69 +++++++++++++++++++
2 files changed, 94 insertions(+), 1 deletion(-)
diff --git a/app/services/user_session_tracking_service.rb b/app/services/user_session_tracking_service.rb
index 28f272a18..d7e6f6efb 100644
--- a/app/services/user_session_tracking_service.rb
+++ b/app/services/user_session_tracking_service.rb
@@ -1,4 +1,11 @@
class UserSessionTrackingService
+ # CFNetwork UAs cannot distinguish iPhone from iPad; both get labelled iPhone here.
+ LEGACY_MOBILE_UAS = [
+ { match: %r{\Aokhttp/}, platform: 'Android', device: 'Android' },
+ { match: %r{\AChatwoot/.*CFNetwork.*Darwin}, platform: 'iPhone', device: 'iPhone' }
+ ].freeze
+ private_constant :LEGACY_MOBILE_UAS
+
def initialize(user:, request:, client_id:)
@user = user
@request = request
@@ -26,7 +33,7 @@ class UserSessionTrackingService
def session_attributes
browser = Browser.new(@request.user_agent)
- {
+ attrs = {
ip_address: @request.remote_ip,
user_agent: @request.user_agent,
browser_name: browser.name,
@@ -35,5 +42,22 @@ class UserSessionTrackingService
platform_name: browser.platform.name,
platform_version: browser.platform.version
}
+
+ patch_for_legacy_mobile(attrs)
+ end
+
+ def patch_for_legacy_mobile(attrs)
+ return attrs unless attrs[:browser_name] == 'Unknown Browser'
+
+ hit = LEGACY_MOBILE_UAS.find { |m| @request.user_agent.to_s.match?(m[:match]) }
+ return attrs unless hit
+
+ attrs.merge(
+ browser_name: 'Chatwoot Mobile',
+ browser_version: nil,
+ platform_name: hit[:platform],
+ platform_version: nil,
+ device_name: hit[:device]
+ )
end
end
diff --git a/spec/services/user_session_tracking_service_spec.rb b/spec/services/user_session_tracking_service_spec.rb
index 71b6d5924..2b98b95bf 100644
--- a/spec/services/user_session_tracking_service_spec.rb
+++ b/spec/services/user_session_tracking_service_spec.rb
@@ -47,6 +47,75 @@ RSpec.describe UserSessionTrackingService do
expect(existing.reload.ip_address).to eq('8.8.8.8')
expect(existing.last_activity_at).to be_within(1.second).of(Time.current)
end
+
+ context 'with a Chatwoot Mobile legacy User-Agent' do
+ let(:request) do
+ instance_double(
+ ActionDispatch::Request,
+ user_agent: ua,
+ remote_ip: '8.8.8.8'
+ )
+ end
+
+ context 'when the UA is okhttp (Android Chatwoot Mobile)' do
+ let(:ua) { 'okhttp/4.9.2' }
+
+ it 'labels the session as Chatwoot Mobile on Android', :aggregate_failures do
+ service.create_or_update!
+
+ session = user.user_sessions.last
+ expect(session.browser_name).to eq('Chatwoot Mobile')
+ expect(session.browser_version).to be_nil
+ expect(session.platform_name).to eq('Android')
+ expect(session.platform_version).to be_nil
+ expect(session.device_name).to eq('Android')
+ expect(session.user_agent).to eq(ua)
+ end
+ end
+
+ context 'when the UA is CFNetwork (iOS Chatwoot Mobile)' do
+ let(:ua) { 'Chatwoot/3759 CFNetwork/3886.100.1 Darwin/27.0.0' }
+
+ it 'labels the session as Chatwoot Mobile on iPhone', :aggregate_failures do
+ service.create_or_update!
+
+ session = user.user_sessions.last
+ expect(session.browser_name).to eq('Chatwoot Mobile')
+ expect(session.browser_version).to be_nil
+ expect(session.platform_name).to eq('iPhone')
+ expect(session.platform_version).to be_nil
+ expect(session.device_name).to eq('iPhone')
+ expect(session.user_agent).to eq(ua)
+ end
+ end
+
+ context 'when the UA is a real browser (Firefox on Linux)' do
+ let(:ua) { 'Mozilla/5.0 (X11; Linux x86_64; rv:124.0) Gecko/20100101 Firefox/124.0' }
+
+ it 'does not override the Browser-derived metadata', :aggregate_failures do
+ service.create_or_update!
+
+ session = user.user_sessions.last
+ expect(session.browser_name).to eq('Firefox')
+ expect(session.platform_name).to eq('Generic Linux')
+ expect(session.device_name).not_to eq('Android')
+ expect(session.device_name).not_to eq('iPhone')
+ end
+ end
+
+ context 'when the UA is unknown but does not match any mobile pattern' do
+ let(:ua) { 'curl/8.4.0' }
+
+ it 'leaves the Unknown labels untouched', :aggregate_failures do
+ service.create_or_update!
+
+ session = user.user_sessions.last
+ expect(session.browser_name).to eq('Unknown Browser')
+ expect(session.platform_name).to eq('Unknown')
+ expect(session.device_name).to eq('Unknown')
+ end
+ end
+ end
end
describe '#update_activity!' do
From 124782938ddbbca065296d77115bb8d9b2057c69 Mon Sep 17 00:00:00 2001
From: Sony Mathew <2040199+sony-mathew@users.noreply.github.com>
Date: Wed, 17 Jun 2026 00:10:47 +0530
Subject: [PATCH 18/26] Bump version to 4.15.0
---
VERSION_CW | 2 +-
config/app.yml | 2 +-
package.json | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/VERSION_CW b/VERSION_CW
index 0fb7a35b6..5c517bf11 100644
--- a/VERSION_CW
+++ b/VERSION_CW
@@ -1 +1 @@
-4.14.2
+4.15.0
diff --git a/config/app.yml b/config/app.yml
index c2494befa..c2c192018 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
shared: &shared
- version: '4.14.2'
+ version: '4.15.0'
development:
<<: *shared
diff --git a/package.json b/package.json
index fc4598bc4..b8ab60839 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@chatwoot/chatwoot",
- "version": "4.14.2",
+ "version": "4.15.0",
"license": "MIT",
"scripts": {
"eslint": "eslint app/**/*.{js,vue}",
From f66b551c7d6778b7984041832cbba70bc833cde3 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan
Date: Wed, 17 Jun 2026 16:28:48 +0530
Subject: [PATCH 19/26] revert: Sidebar unread counts for filters (CW-7262)
(#14769)
## Description
Reverts [#14726](https://github.com/chatwoot/chatwoot/pull/14726)
(\"feat: Add sidebar unread counts for filters (CW-7262)\"), which
shipped in 4.15.0.
After 4.15.0 rolled out to prod the unread-counts-for-filters code path
caused a cascading incident:
- `Counter#ensure_filters_cache!` fires on every `/unread_counts/index`
and `update_last_seen` request.
- On cache miss it calls `Builder#build_filters_for!`, which:
- invokes `store.clear_user_filters!` -> `delete_matching` -> a Redis
`SCAN_each` over a per-user pattern keyspace, and
- runs 4 fresh SQL passes per user (mentions, participating, unattended,
and per-folder `Conversations::FilterService` queries).
- Threads blocked in the SCAN held their DB connections, the connection
pool exhausted, Sidekiq jobs were discarded with
`ActiveJob::DeserializationError: could not obtain a connection from the
pool`, and the enqueued queue blew past 200K.
Related:
[CW-7262](https://linear.app/chatwoot/issue/CW-7262/unread-counts-for-filters-folders)
## Type of change
- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality not to work as expected)
- [ ] This change requires a documentation update
## How Has This Been Tested?
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [ ] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---
app/finders/conversation_finder.rb | 2 +-
.../components-next/sidebar/ChannelLeaf.vue | 6 +-
.../components-next/sidebar/Sidebar.vue | 38 ---
.../sidebar/SidebarCollapsedPopover.vue | 10 +-
.../sidebar/SidebarGroupLeaf.vue | 5 +-
.../sidebar/SidebarUnreadBadge.vue | 2 -
.../sidebar/specs/ChannelLeaf.spec.js | 12 -
.../sidebar/specs/SidebarGroupLeaf.spec.js | 19 +-
.../dashboard/i18n/locale/en/settings.json | 10 -
.../store/modules/conversationUnreadCounts.js | 23 --
.../conversationUnreadCounts/getters.spec.js | 22 --
.../mutations.spec.js | 19 --
app/listeners/action_cable_listener.rb | 4 +-
app/models/account.rb | 2 +-
app/models/account_user.rb | 9 -
app/models/concerns/cache_keys.rb | 1 +
app/models/conversation_participant.rb | 5 -
app/models/custom_filter.rb | 9 -
app/models/inbox_member.rb | 12 -
app/models/mention.rb | 5 -
app/services/conversations/filter_service.rb | 10 +-
.../unread_counts/broadcast_scope.rb | 14 +-
.../unread_counts/build_lock_keys.rb | 15 --
.../conversations/unread_counts/builder.rb | 139 +----------
.../conversations/unread_counts/counter.rb | 45 ++--
.../unread_counts/filter_counter.rb | 40 ----
.../conversations/unread_counts/listener.rb | 39 +---
.../conversations/unread_counts/notifier.rb | 4 +-
.../conversations/unread_counts/store.rb | 20 +-
.../conversations/unread_counts/store_keys.rb | 16 --
.../unread_counts/user_filter_notifier.rb | 19 --
.../unread_counts/user_filter_store.rb | 100 --------
app/services/filter_service.rb | 12 +-
.../finders/enterprise/conversation_finder.rb | 26 ---
enterprise/app/models/custom_role.rb | 23 --
lib/redis/redis_keys.rb | 15 --
.../accounts/conversations_controller_spec.rb | 43 +---
.../super_admin/accounts_controller_spec.rb | 2 +-
.../finders/conversation_finder_spec.rb | 24 --
spec/enterprise/models/account_user_spec.rb | 18 --
spec/enterprise/models/custom_role_spec.rb | 34 ---
.../unread_counts/counter_spec.rb | 60 ++---
spec/finders/conversation_finder_spec.rb | 19 --
spec/listeners/action_cable_listener_spec.rb | 14 --
spec/models/account_spec.rb | 59 +----
spec/models/account_user_spec.rb | 28 ---
spec/models/inbox_member_spec.rb | 26 ---
.../unread_counts/builder_spec.rb | 197 +---------------
.../unread_counts/counter_spec.rb | 78 +------
.../unread_counts/listener_spec.rb | 51 +---
.../unread_counts/notifier_spec.rb | 12 -
.../unread_counts/refresher_spec.rb | 2 +-
.../conversations/unread_counts/store_spec.rb | 218 +-----------------
.../user_filter_notifier_spec.rb | 37 ---
54 files changed, 95 insertions(+), 1579 deletions(-)
delete mode 100644 app/services/conversations/unread_counts/build_lock_keys.rb
delete mode 100644 app/services/conversations/unread_counts/filter_counter.rb
delete mode 100644 app/services/conversations/unread_counts/user_filter_notifier.rb
delete mode 100644 app/services/conversations/unread_counts/user_filter_store.rb
delete mode 100644 spec/enterprise/finders/conversation_finder_spec.rb
delete mode 100644 spec/services/conversations/unread_counts/user_filter_notifier_spec.rb
diff --git a/app/finders/conversation_finder.rb b/app/finders/conversation_finder.rb
index 9d53ec97e..74bf903f5 100644
--- a/app/finders/conversation_finder.rb
+++ b/app/finders/conversation_finder.rb
@@ -142,7 +142,7 @@ class ConversationFinder
conversation_ids = current_account.mentions.where(user: current_user).pluck(:conversation_id)
@conversations = @conversations.where(id: conversation_ids)
when 'participating'
- @conversations = @conversations.where(id: current_user.participating_conversations.where(account_id: current_account.id).select(:id))
+ @conversations = current_user.participating_conversations.where(account_id: current_account.id)
when 'unattended'
@conversations = @conversations.unattended
end
diff --git a/app/javascript/dashboard/components-next/sidebar/ChannelLeaf.vue b/app/javascript/dashboard/components-next/sidebar/ChannelLeaf.vue
index 234737008..a995cf510 100644
--- a/app/javascript/dashboard/components-next/sidebar/ChannelLeaf.vue
+++ b/app/javascript/dashboard/components-next/sidebar/ChannelLeaf.vue
@@ -22,10 +22,6 @@ const props = defineProps({
type: [Number, String],
default: 0,
},
- badgeTooltip: {
- type: String,
- default: '',
- },
});
const reauthorizationRequired = computed(() => {
@@ -38,7 +34,7 @@ const reauthorizationRequired = computed(() => {
@@ -54,7 +83,13 @@ const localeCount = computed(() => props.locales?.length);
>
{{ label }}
- {{ label }}
-
})
);
-const unreadBadgeTooltips = computed(() => ({
- ALL: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.ALL'),
- INBOX: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.INBOX'),
- LABEL: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.LABEL'),
- TEAM: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.TEAM'),
- FOLDER: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.FOLDER'),
- MENTIONS: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.MENTIONS'),
- PARTICIPATING: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.PARTICIPATING'),
- UNATTENDED: t('SIDEBAR.UNREAD_COUNT_TOOLTIP.UNATTENDED'),
-}));
-
-const unreadBadgeTooltip = type => unreadBadgeTooltips.value[type];
-
const closeMobileSidebar = () => {
if (!props.isMobileSidebarOpen) return;
emit('closeMobileSidebar');
@@ -360,15 +335,12 @@ const menuItems = computed(() => {
label: t('SIDEBAR.ALL_CONVERSATIONS'),
icon: 'i-lucide-inbox',
badgeCount: allUnreadCount.value,
- badgeTooltip: unreadBadgeTooltip('ALL'),
activeOn: ['inbox_conversation'],
to: accountScopedRoute('home'),
},
{
name: 'Mentions',
label: t('SIDEBAR.MENTIONED_CONVERSATIONS'),
- badgeCount: mentionsUnreadCount.value,
- badgeTooltip: unreadBadgeTooltip('MENTIONS'),
icon: 'i-lucide-at-sign',
activeOn: ['conversation_through_mentions'],
to: accountScopedRoute('conversation_mentions'),
@@ -376,8 +348,6 @@ const menuItems = computed(() => {
{
name: 'Participating',
label: t('SIDEBAR.PARTICIPATING_CONVERSATIONS'),
- badgeCount: participatingUnreadCount.value,
- badgeTooltip: unreadBadgeTooltip('PARTICIPATING'),
icon: 'i-lucide-user-round-check',
activeOn: ['conversation_through_participating'],
to: accountScopedRoute('conversation_participating'),
@@ -385,8 +355,6 @@ const menuItems = computed(() => {
{
name: 'Unattended',
activeOn: ['conversation_through_unattended'],
- badgeCount: unattendedUnreadCount.value,
- badgeTooltip: unreadBadgeTooltip('UNATTENDED'),
label: t('SIDEBAR.UNATTENDED_CONVERSATIONS'),
icon: 'i-lucide-clock-alert',
to: accountScopedRoute('conversation_unattended'),
@@ -402,8 +370,6 @@ const menuItems = computed(() => {
children: sortedFolders.value.map(view => ({
name: `${view.name}-${view.id}`,
label: view.name,
- badgeCount: getFolderUnreadCount.value(view.id),
- badgeTooltip: unreadBadgeTooltip('FOLDER'),
to: accountScopedRoute('folder_conversations', { id: view.id }),
})),
},
@@ -419,7 +385,6 @@ const menuItems = computed(() => {
name: `${team.name}-${team.id}`,
label: team.name,
badgeCount: getTeamUnreadCount.value(team.id),
- badgeTooltip: unreadBadgeTooltip('TEAM'),
to: accountScopedRoute('team_conversations', { teamId: team.id }),
})),
},
@@ -435,7 +400,6 @@ const menuItems = computed(() => {
name: `${inbox.name}-${inbox.id}`,
label: inbox.name,
badgeCount: getInboxUnreadCount.value(inbox.id),
- badgeTooltip: unreadBadgeTooltip('INBOX'),
icon: h(ChannelIcon, { inbox, class: 'size-[16px]' }),
to: accountScopedRoute('inbox_dashboard', { inbox_id: inbox.id }),
component: leafProps =>
@@ -444,7 +408,6 @@ const menuItems = computed(() => {
active: leafProps.active,
inbox,
badgeCount: leafProps.badgeCount,
- badgeTooltip: leafProps.badgeTooltip,
}),
})),
},
@@ -460,7 +423,6 @@ const menuItems = computed(() => {
name: `${label.title}-${label.id}`,
label: label.title,
badgeCount: getLabelUnreadCount.value(label.id),
- badgeTooltip: unreadBadgeTooltip('LABEL'),
icon: h('span', {
class: `size-[8px] rounded-sm`,
style: { backgroundColor: label.color },
diff --git a/app/javascript/dashboard/components-next/sidebar/SidebarCollapsedPopover.vue b/app/javascript/dashboard/components-next/sidebar/SidebarCollapsedPopover.vue
index 8f1de246e..2e431eb7e 100644
--- a/app/javascript/dashboard/components-next/sidebar/SidebarCollapsedPopover.vue
+++ b/app/javascript/dashboard/components-next/sidebar/SidebarCollapsedPopover.vue
@@ -197,10 +197,7 @@ onMounted(async () => {
class="size-4 flex-shrink-0"
/>
{{ subChild.label }}
- d'.freeze
UNREAD_CONVERSATIONS_BASE_READY = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::READY::BASE'.freeze
UNREAD_CONVERSATIONS_ASSIGNMENT_READY = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::READY::ASSIGNMENT'.freeze
- UNREAD_CONVERSATIONS_USER_FILTERS_READY =
- 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::READY::FILTERS'.freeze
- UNREAD_CONVERSATIONS_FILTERS_VERSION = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::VERSION::FILTERS'.freeze
- UNREAD_CONVERSATIONS_USER_FILTERS_VERSION =
- 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::VERSION::FILTERS'.freeze
UNREAD_CONVERSATIONS_BASE_BUILD_LOCK = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::BUILD_LOCK::BASE'.freeze
UNREAD_CONVERSATIONS_ASSIGNMENT_BUILD_LOCK = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::BUILD_LOCK::ASSIGNMENT'.freeze
- UNREAD_CONVERSATIONS_USER_FILTERS_BUILD_LOCK =
- 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::BUILD_LOCK::FILTERS'.freeze
UNREAD_CONVERSATIONS_INBOX = 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::INBOX::%d'.freeze
UNREAD_CONVERSATIONS_LABEL_INBOX =
'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::LABEL::%d::INBOX::%d'.freeze
@@ -40,14 +33,6 @@ module Redis::RedisKeys
'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::TEAM::%d::INBOX::%d::UNASSIGNED'.freeze
UNREAD_CONVERSATIONS_TEAM_INBOX_ASSIGNEE =
'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::TEAM::%d::INBOX::%d::ASSIGNEE::%d'.freeze
- UNREAD_CONVERSATIONS_USER_MENTIONS =
- 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::MENTIONS'.freeze
- UNREAD_CONVERSATIONS_USER_PARTICIPATING =
- 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::PARTICIPATING'.freeze
- UNREAD_CONVERSATIONS_USER_UNATTENDED =
- 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::UNATTENDED'.freeze
- UNREAD_CONVERSATIONS_USER_FOLDER =
- 'UNREAD_CONVERSATIONS::V1::ACCOUNT::%d::USER::%d::FOLDER::%d'.freeze
## User Keys
# SSO Auth Tokens
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index de3cc4a3c..bdb8117ac 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -123,7 +123,7 @@ RSpec.describe 'Conversations API', type: :request do
end
after do
- Conversations::UnreadCounts::Store.clear_all_account!(account.id)
+ Conversations::UnreadCounts::Store.clear_account!(account.id)
end
context 'when conversation unread counts feature is enabled' do
@@ -144,42 +144,7 @@ RSpec.describe 'Conversations API', type: :request do
'all_count' => 1,
'inboxes' => { visible_inbox.id.to_s => 1 },
'labels' => { label.id.to_s => 1 },
- 'teams' => {},
- 'mentions_count' => 0,
- 'participating_count' => 0,
- 'unattended_count' => 1,
- 'folders' => {}
- )
- end
-
- it 'returns unread counts for mentions, participating conversations, unattended conversations, and folders' do
- mentioned_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
- participating_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
- resolved_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
- resolved_conversation.update!(status: :resolved)
- custom_filter = create(:custom_filter, account: account, user: agent, filter_type: :conversation, query: {
- payload: [{
- attribute_key: 'status',
- filter_operator: 'equal_to',
- values: ['resolved'],
- query_operator: nil,
- custom_attribute_type: ''
- }]
- })
-
- create(:mention, account: account, conversation: mentioned_conversation, user: agent)
- create(:conversation_participant, account: account, conversation: participating_conversation, user: agent)
-
- get "/api/v1/accounts/#{account.id}/conversations/unread_counts",
- headers: agent.create_new_auth_token,
- as: :json
-
- expect(response).to have_http_status(:success)
- expect(response.parsed_body['payload']).to include(
- 'mentions_count' => 1,
- 'participating_count' => 1,
- 'unattended_count' => 2,
- 'folders' => { custom_filter.id.to_s => 1 }
+ 'teams' => {}
)
end
@@ -897,7 +862,7 @@ RSpec.describe 'Conversations API', type: :request do
expect(response).to have_http_status(:success)
expect(Conversations::UnreadCounts::Store.counts_for_keys([inbox_key])).to eq(inbox_key => 0)
ensure
- Conversations::UnreadCounts::Store.clear_all_account!(account.id)
+ Conversations::UnreadCounts::Store.clear_account!(account.id)
end
it 'updates both if one timestamp is old even when the other is recent' do
@@ -984,7 +949,7 @@ RSpec.describe 'Conversations API', type: :request do
expect(response).to have_http_status(:success)
expect(Conversations::UnreadCounts::Store.counts_for_keys([inbox_key])).to eq(inbox_key => 1)
ensure
- Conversations::UnreadCounts::Store.clear_all_account!(account.id)
+ Conversations::UnreadCounts::Store.clear_account!(account.id)
end
end
end
diff --git a/spec/controllers/super_admin/accounts_controller_spec.rb b/spec/controllers/super_admin/accounts_controller_spec.rb
index 917499cd5..e4ff81a08 100644
--- a/spec/controllers/super_admin/accounts_controller_spec.rb
+++ b/spec/controllers/super_admin/accounts_controller_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe 'Super Admin accounts API', type: :request do
end
after do
- Conversations::UnreadCounts::Store.clear_all_account!(account.id)
+ Conversations::UnreadCounts::Store.clear_account!(account.id)
end
context 'when it is an unauthenticated user' do
diff --git a/spec/enterprise/finders/conversation_finder_spec.rb b/spec/enterprise/finders/conversation_finder_spec.rb
deleted file mode 100644
index f8b9fce58..000000000
--- a/spec/enterprise/finders/conversation_finder_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe ConversationFinder do
- describe '#perform' do
- it 'returns participant-only conversations for custom roles with participating permission' do
- account = create(:account)
- agent = create(:user, account: account, role: :agent)
- other_agent = create(:user, account: account, role: :agent)
- inbox = create(:inbox, account: account, enable_auto_assignment: false)
- custom_role = create(:custom_role, account: account, permissions: ['conversation_participating_manage'])
- participating_conversation = create(:conversation, account: account, inbox: inbox, assignee: other_agent)
-
- create(:inbox_member, user: agent, inbox: inbox)
- create(:inbox_member, user: other_agent, inbox: inbox)
- create(:conversation_participant, account: account, conversation: participating_conversation, user: agent)
- account.account_users.find_by!(user_id: agent.id).update!(custom_role: custom_role)
- Current.account = account
-
- result = described_class.new(agent, { status: 'open', conversation_type: 'participating' }).perform
-
- expect(result[:conversations].map(&:id)).to include(participating_conversation.id)
- end
- end
-end
diff --git a/spec/enterprise/models/account_user_spec.rb b/spec/enterprise/models/account_user_spec.rb
index e157d9acd..fb572e86a 100644
--- a/spec/enterprise/models/account_user_spec.rb
+++ b/spec/enterprise/models/account_user_spec.rb
@@ -29,24 +29,6 @@ RSpec.describe AccountUser, type: :model do
end
end
- describe 'unread filter count invalidation' do
- it 'notifies when the assigned custom role changes' do
- account = create(:account)
- custom_role = create(:custom_role, account: account)
- account_user = create(:account_user, account: account)
- notifier = instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true)
- allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
-
- account_user.update!(custom_role: custom_role)
-
- expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(
- account: account,
- user: account_user.user
- )
- expect(notifier).to have_received(:perform)
- end
- end
-
describe 'audit log' do
context 'when account user is created' do
it 'has associated audit log created' do
diff --git a/spec/enterprise/models/custom_role_spec.rb b/spec/enterprise/models/custom_role_spec.rb
index 553a5a33a..f63f3c2dd 100644
--- a/spec/enterprise/models/custom_role_spec.rb
+++ b/spec/enterprise/models/custom_role_spec.rb
@@ -9,38 +9,4 @@ RSpec.describe CustomRole, type: :model do
describe 'validations' do
it { is_expected.to validate_presence_of(:name) }
end
-
- describe 'unread filter count invalidation' do
- it 'notifies assigned users when permissions change' do
- account = create(:account)
- custom_role = create(:custom_role, account: account, permissions: ['conversation_participating_manage'])
- account_user = create(:account_user, account: account, custom_role: custom_role)
- notifier = instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true)
- allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
-
- custom_role.update!(permissions: ['conversation_manage'])
-
- expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(
- account: account,
- user: account_user.user
- )
- expect(notifier).to have_received(:perform)
- end
-
- it 'notifies assigned users when the custom role is destroyed' do
- account = create(:account)
- custom_role = create(:custom_role, account: account, permissions: ['conversation_participating_manage'])
- account_user = create(:account_user, account: account, custom_role: custom_role)
- notifier = instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true)
- allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
-
- custom_role.destroy!
-
- expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(
- account: account,
- user: account_user.user
- )
- expect(notifier).to have_received(:perform)
- end
- end
end
diff --git a/spec/enterprise/services/conversations/unread_counts/counter_spec.rb b/spec/enterprise/services/conversations/unread_counts/counter_spec.rb
index 86a93bd8c..e8f850e78 100644
--- a/spec/enterprise/services/conversations/unread_counts/counter_spec.rb
+++ b/spec/enterprise/services/conversations/unread_counts/counter_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Conversations::UnreadCounts::Counter do
end
after do
- store.clear_all_account!(account.id)
+ store.clear_account!(account.id)
end
it 'uses base counts for custom roles with conversation_manage permission' do
@@ -26,16 +26,10 @@ RSpec.describe Conversations::UnreadCounts::Counter do
result = described_class.new(account: account, user: agent).perform
- expect(result).to eq(
- all_count: 2,
- inboxes: { inbox.id.to_s => 2 },
- labels: { label.id.to_s => 2 },
- teams: { team.id.to_s => 2 },
- mentions_count: 0,
- participating_count: 0,
- unattended_count: 2,
- folders: {}
- )
+ expect(result[:all_count]).to eq(2)
+ expect(result[:inboxes]).to eq(inbox.id.to_s => 2)
+ expect(result[:labels]).to eq(label.id.to_s => 2)
+ expect(result[:teams]).to eq(team.id.to_s => 2)
expect(store.assignment_ready?(account.id)).to be(false)
end
@@ -43,21 +37,14 @@ RSpec.describe Conversations::UnreadCounts::Counter do
account_user.update!(custom_role: create(:custom_role, account: account, permissions: ['conversation_unassigned_manage']))
create_unread_conversation(account: account, inbox: inbox, labels: [label.title], assignee: agent, team: team)
create_unread_conversation(account: account, inbox: inbox, labels: [label.title], team: team)
- other_assigned_conversation = create_unread_conversation(account: account, inbox: inbox, labels: [label.title], assignee: other_agent, team: team)
- create(:conversation_participant, account: account, conversation: other_assigned_conversation, user: agent)
+ create_unread_conversation(account: account, inbox: inbox, labels: [label.title], assignee: other_agent, team: team)
result = described_class.new(account: account, user: agent).perform
- expect(result).to eq(
- all_count: 2,
- inboxes: { inbox.id.to_s => 2 },
- labels: { label.id.to_s => 2 },
- teams: { team.id.to_s => 2 },
- mentions_count: 0,
- participating_count: 0,
- unattended_count: 2,
- folders: {}
- )
+ expect(result[:all_count]).to eq(2)
+ expect(result[:inboxes]).to eq(inbox.id.to_s => 2)
+ expect(result[:labels]).to eq(label.id.to_s => 2)
+ expect(result[:teams]).to eq(team.id.to_s => 2)
expect(store.assignment_ready?(account.id)).to be(true)
end
@@ -65,21 +52,13 @@ RSpec.describe Conversations::UnreadCounts::Counter do
account_user.update!(custom_role: create(:custom_role, account: account, permissions: ['conversation_participating_manage']))
create_unread_conversation(account: account, inbox: inbox, labels: [label.title], assignee: agent, team: team)
create_unread_conversation(account: account, inbox: inbox, labels: [label.title], team: team)
- participating_conversation = create_unread_conversation(account: account, inbox: inbox, labels: [label.title], team: team)
- create(:conversation_participant, account: account, conversation: participating_conversation, user: agent)
result = described_class.new(account: account, user: agent).perform
- expect(result).to eq(
- all_count: 1,
- inboxes: { inbox.id.to_s => 1 },
- labels: { label.id.to_s => 1 },
- teams: { team.id.to_s => 1 },
- mentions_count: 0,
- participating_count: 1,
- unattended_count: 1,
- folders: {}
- )
+ expect(result[:all_count]).to eq(1)
+ expect(result[:inboxes]).to eq(inbox.id.to_s => 1)
+ expect(result[:labels]).to eq(label.id.to_s => 1)
+ expect(result[:teams]).to eq(team.id.to_s => 1)
expect(store.assignment_ready?(account.id)).to be(true)
end
@@ -89,16 +68,7 @@ RSpec.describe Conversations::UnreadCounts::Counter do
result = described_class.new(account: account, user: agent).perform
- expect(result).to eq(
- all_count: 0,
- inboxes: {},
- labels: {},
- teams: {},
- mentions_count: 0,
- participating_count: 0,
- unattended_count: 0,
- folders: {}
- )
+ expect(result).to eq(all_count: 0, inboxes: {}, labels: {}, teams: {})
expect(store.base_ready?(account.id)).to be(false)
expect(store.assignment_ready?(account.id)).to be(false)
end
diff --git a/spec/finders/conversation_finder_spec.rb b/spec/finders/conversation_finder_spec.rb
index 31cbceb6a..64f134fe2 100644
--- a/spec/finders/conversation_finder_spec.rb
+++ b/spec/finders/conversation_finder_spec.rb
@@ -208,25 +208,6 @@ describe ConversationFinder do
end
end
- context 'with participating conversation type' do
- let(:params) { { status: 'open', conversation_type: 'participating' } }
-
- it 'does not return participating conversations from inboxes where the agent is no longer a member' do
- visible_conversation = create(:conversation, account: account, inbox: inbox)
- inaccessible_conversation = create(:conversation, account: account, inbox: restricted_inbox)
- create(:inbox_member, user: user_1, inbox: restricted_inbox)
- create(:conversation_participant, account: account, conversation: visible_conversation, user: user_1)
- create(:conversation_participant, account: account, conversation: inaccessible_conversation, user: user_1)
- InboxMember.find_by!(user: user_1, inbox: restricted_inbox).destroy!
-
- result = conversation_finder.perform
- conversation_ids = result[:conversations].map(&:id)
-
- expect(conversation_ids).to include(visible_conversation.id)
- expect(conversation_ids).not_to include(inaccessible_conversation.id)
- end
- end
-
context 'without source' do
let(:params) { {} }
diff --git a/spec/listeners/action_cable_listener_spec.rb b/spec/listeners/action_cable_listener_spec.rb
index 7a774dbd5..cdb9a93cb 100644
--- a/spec/listeners/action_cable_listener_spec.rb
+++ b/spec/listeners/action_cable_listener_spec.rb
@@ -294,19 +294,5 @@ describe ActionCableListener do
listener.conversation_unread_count_changed(event)
end
-
- it 'supports user-scoped unread count refresh events' do
- event = Events::Base.new(event_name, Time.zone.now, account: account, user: agent)
-
- expect(ActionCableBroadcastJob).to receive(:perform_later).with(
- a_collection_containing_exactly(agent.pubsub_token),
- 'conversation.unread_count_changed',
- {
- account_id: account.id
- }
- )
-
- listener.conversation_unread_count_changed(event)
- end
end
end
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index d77a16fdb..38ca9694a 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -53,79 +53,38 @@ RSpec.describe Account do
describe 'conversation unread counts feature flag' do
let(:account) { create(:account) }
let(:inbox) { create(:inbox, account: account) }
- let(:user) { create(:user) }
let(:store) { Conversations::UnreadCounts::Store }
let(:inbox_key) { store.inbox_key(account.id, inbox.id) }
- let(:filter_keys) do
- [
- store.user_mentions_key(account.id, user.id),
- store.user_participating_key(account.id, user.id),
- store.user_unattended_key(account.id, user.id),
- store.user_folder_key(account.id, user.id, 1)
- ]
- end
after do
- store.clear_all_account!(account.id)
+ store.clear_account!(account.id)
end
- it 'clears all unread count cache when the feature is enabled' do
+ it 'clears unread count cache when the feature is enabled' do
build_unread_count_cache
account.enable_features!(:conversation_unread_counts)
- expect_unread_count_cache_cleared
+ expect(store.base_ready?(account.id)).to be(false)
+ expect(store.assignment_ready?(account.id)).to be(false)
+ expect(store.counts_for_keys([inbox_key])).to eq(inbox_key => 0)
end
- it 'clears all unread count cache when the feature is disabled' do
+ it 'clears unread count cache when the feature is disabled' do
account.enable_features!(:conversation_unread_counts)
build_unread_count_cache
account.disable_features!(:conversation_unread_counts)
- expect_unread_count_cache_cleared
- end
-
- it 'clears all unread count cache when account cache keys are reset' do
- build_unread_count_cache
-
- account.reset_cache_keys
-
- expect_unread_count_cache_cleared
- end
-
- def expect_unread_count_cache_cleared
- expect(unread_count_ready_markers).to all(be(false))
- expect(store.counts_for_keys(unread_count_keys).values).to all(eq(0))
- end
-
- def unread_count_ready_markers
- [
- store.base_ready?(account.id),
- store.assignment_ready?(account.id),
- store.filters_ready?(account.id, user.id)
- ]
- end
-
- def unread_count_keys
- [inbox_key] + filter_keys
+ expect(store.base_ready?(account.id)).to be(false)
+ expect(store.assignment_ready?(account.id)).to be(false)
+ expect(store.counts_for_keys([inbox_key])).to eq(inbox_key => 0)
end
def build_unread_count_cache
store.mark_base_ready!(account.id)
store.mark_assignment_ready!(account.id)
- store.mark_filters_ready!(account.id, user.id)
store.add_base_membership(account_id: account.id, inbox_id: inbox.id, label_ids: [], conversation_id: 1)
- store.add_filter_memberships(
- account_id: account.id,
- user_id: user.id,
- filters: {
- mentions: [1],
- participating: [2],
- unattended: [3]
- },
- folders: { 1 => [4] }
- )
end
end
diff --git a/spec/models/account_user_spec.rb b/spec/models/account_user_spec.rb
index 7acfc19cd..e5a560fe9 100644
--- a/spec/models/account_user_spec.rb
+++ b/spec/models/account_user_spec.rb
@@ -42,32 +42,4 @@ RSpec.describe AccountUser do
expect(user.assigned_conversations.count).to eq(0)
end
end
-
- describe 'unread filter count invalidation' do
- let(:notifier) { instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true) }
-
- before do
- allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
- end
-
- it 'notifies when the account role changes' do
- account_user.update!(role: :administrator)
-
- expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(
- account: account_user.account,
- user: account_user.user
- )
- expect(notifier).to have_received(:perform)
- end
-
- it 'notifies when account access is removed' do
- expect(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).with(
- account: account_user.account,
- user: account_user.user
- ).and_return(notifier)
- expect(notifier).to receive(:perform)
-
- account_user.destroy!
- end
- end
end
diff --git a/spec/models/inbox_member_spec.rb b/spec/models/inbox_member_spec.rb
index df569c695..b081c546c 100644
--- a/spec/models/inbox_member_spec.rb
+++ b/spec/models/inbox_member_spec.rb
@@ -18,30 +18,4 @@ RSpec.describe InboxMember do
end
end
end
-
- describe 'unread filter count invalidation' do
- let(:account) { create(:account) }
- let(:inbox) { create(:inbox, account: account) }
- let(:user) { create(:user, account: account, role: :agent) }
- let(:notifier) { instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true) }
-
- before do
- allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
- end
-
- it 'notifies when inbox access is added' do
- create(:inbox_member, inbox: inbox, user: user)
-
- expect(Conversations::UnreadCounts::UserFilterNotifier).to have_received(:new).with(account: account, user: user)
- expect(notifier).to have_received(:perform)
- end
-
- it 'notifies when inbox access is removed' do
- inbox_member = create(:inbox_member, inbox: inbox, user: user)
- expect(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).with(account: account, user: user).and_return(notifier)
- expect(notifier).to receive(:perform)
-
- inbox_member.destroy!
- end
- end
end
diff --git a/spec/services/conversations/unread_counts/builder_spec.rb b/spec/services/conversations/unread_counts/builder_spec.rb
index fe1bdb6fa..4b3aec230 100644
--- a/spec/services/conversations/unread_counts/builder_spec.rb
+++ b/spec/services/conversations/unread_counts/builder_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Conversations::UnreadCounts::Builder do
let(:store) { Conversations::UnreadCounts::Store }
after do
- store.clear_all_account!(account.id)
+ store.clear_account!(account.id)
end
describe '#build_base!' do
@@ -75,173 +75,6 @@ RSpec.describe Conversations::UnreadCounts::Builder do
end
end
- describe '#build_filters_for!' do
- before do
- create(:inbox_member, user: assignee, inbox: inbox)
- end
-
- it 'stores unread open conversations by mentions and participating dimensions' do
- mentioned_conversation = create_unread_conversation(account: account, inbox: inbox)
- participating_conversation = create_unread_conversation(account: account, inbox: inbox)
- resolved_mentioned_conversation = create_unread_conversation(account: account, inbox: inbox)
- inaccessible_conversation = create_unread_conversation(account: account, inbox: create(:inbox, account: account))
- resolved_mentioned_conversation.update!(status: :resolved)
-
- create(:mention, account: account, conversation: mentioned_conversation, user: assignee)
- create(:mention, account: account, conversation: resolved_mentioned_conversation, user: assignee)
- create(:mention, account: account, conversation: inaccessible_conversation, user: assignee)
- create(:conversation_participant, account: account, conversation: participating_conversation, user: assignee)
-
- described_class.new(account).build_filters_for!(assignee)
-
- expect(store.filters_ready?(account.id, assignee.id)).to be(true)
- expect(redis_set_members(store.user_mentions_key(account.id, assignee.id))).to contain_exactly(mentioned_conversation.id.to_s)
- expect(redis_set_members(store.user_participating_key(account.id, assignee.id))).to contain_exactly(participating_conversation.id.to_s)
- end
-
- it 'excludes participating conversations that are no longer visible to the user' do
- participating_conversation = create_unread_conversation(account: account, inbox: inbox)
- create(:conversation_participant, account: account, conversation: participating_conversation, user: assignee)
- InboxMember.find_by!(user: assignee, inbox: inbox).destroy!
-
- described_class.new(account).build_filters_for!(assignee)
-
- expect(redis_set_members(store.user_participating_key(account.id, assignee.id))).to be_empty
- end
-
- it 'stores visible unread open unattended conversations' do
- no_first_reply_conversation = create_unread_conversation(account: account, inbox: inbox)
- waiting_conversation = create_unread_conversation(account: account, inbox: inbox)
- attended_conversation = create_unread_conversation(account: account, inbox: inbox)
- inaccessible_conversation = create_unread_conversation(account: account, inbox: create(:inbox, account: account))
- resolved_conversation = create_unread_conversation(account: account, inbox: inbox)
- create_read_conversation
-
- waiting_conversation.update!(first_reply_created_at: 5.minutes.ago)
- attended_conversation.update!(first_reply_created_at: 5.minutes.ago, waiting_since: nil)
- inaccessible_conversation.update!(first_reply_created_at: nil)
- resolved_conversation.update!(status: :resolved)
-
- described_class.new(account).build_filters_for!(assignee)
-
- expect(redis_set_members(store.user_unattended_key(account.id, assignee.id))).to contain_exactly(
- no_first_reply_conversation.id.to_s,
- waiting_conversation.id.to_s
- )
- end
-
- it 'stores folder memberships using the saved filter status conditions' do
- resolved_conversation = create_unread_conversation(account: account, inbox: inbox)
- resolved_conversation.update!(status: :resolved)
- create_unread_conversation(account: account, inbox: inbox, assignee: assignee)
- custom_filter = create(
- :custom_filter, account: account, user: assignee, filter_type: :conversation, query: filter_query('status', ['resolved'])
- )
-
- described_class.new(account).build_filters_for!(assignee)
-
- expect(redis_set_members(store.user_folder_key(account.id, assignee.id, custom_filter.id))).to contain_exactly(resolved_conversation.id.to_s)
- end
-
- it 'loads folder filters after taking the invalidation version snapshot' do
- create_unread_conversation(account: account, inbox: inbox)
- resolved_conversation = create_unread_conversation(account: account, inbox: inbox)
- resolved_conversation.update!(status: :resolved)
- custom_filter = create(
- :custom_filter, account: account, user: assignee, filter_type: :conversation, query: filter_query('status', ['open'])
- )
- notifier = instance_double(Conversations::UnreadCounts::UserFilterNotifier, perform: true)
- allow(Conversations::UnreadCounts::UserFilterNotifier).to receive(:new).and_return(notifier)
- filter_updated = false
- allow(store).to receive(:filter_version_snapshot).and_wrap_original do |method, *args|
- method.call(*args).tap do
- next if filter_updated
-
- filter_updated = true
- custom_filter.update!(query: filter_query('status', ['resolved']))
- end
- end
-
- described_class.new(account).build_filters_for!(assignee)
-
- expect(redis_set_members(store.user_folder_key(account.id, assignee.id, custom_filter.id))).to contain_exactly(resolved_conversation.id.to_s)
- end
-
- it 'expires relative-date folder caches at the next date boundary' do
- create(
- :custom_filter,
- account: account,
- user: assignee,
- filter_type: :conversation,
- query: filter_query('created_at', [7], filter_operator: 'days_before')
- )
- allow(store).to receive(:mark_filters_ready_if_current!).and_call_original
- expected_ttl = nil
-
- travel_to Time.zone.local(2026, 1, 1, 9, 30, 0) do
- expected_ttl = (Time.zone.tomorrow.beginning_of_day - Time.current).ceil
- described_class.new(account).build_filters_for!(assignee)
- end
-
- expect(store).to have_received(:mark_filters_ready_if_current!).with(
- account.id,
- assignee.id,
- version_snapshot: kind_of(Hash),
- expires_in: expected_ttl
- )
- end
-
- it 'does not mark filters ready when user filters are invalidated during the build' do
- conversation = create_unread_conversation(account: account, inbox: inbox)
- create(:mention, account: account, conversation: conversation, user: assignee)
- clear_user_filters_after_membership_write
-
- described_class.new(account).build_filters_for!(assignee)
-
- expect(store.filters_ready?(account.id, assignee.id)).to be(false)
- expect(redis_set_members(store.user_mentions_key(account.id, assignee.id))).to be_empty
- end
-
- it 'does not mark filters ready when account filters are invalidated during the build' do
- conversation = create_unread_conversation(account: account, inbox: inbox)
- create(:mention, account: account, conversation: conversation, user: assignee)
- clear_filter_caches_after_membership_write
-
- described_class.new(account).build_filters_for!(assignee)
-
- expect(store.filters_ready?(account.id, assignee.id)).to be(false)
- expect(redis_set_members(store.user_mentions_key(account.id, assignee.id))).to be_empty
- end
-
- it 'skips invalid folder filters and still marks the user filter cache ready' do
- create_unread_conversation(account: account, inbox: inbox)
- invalid_filter = create(
- :custom_filter, account: account, user: assignee, filter_type: :conversation, query: filter_query('missing_attribute', ['open'])
- )
-
- described_class.new(account).build_filters_for!(assignee)
-
- expect(store.filters_ready?(account.id, assignee.id)).to be(true)
- expect(redis_set_members(store.user_folder_key(account.id, assignee.id, invalid_filter.id))).to be_empty
- end
-
- it 'skips folder filters that fail when the SQL query is executed' do
- conversation = create_unread_conversation(account: account, inbox: inbox)
- invalid_filter = create(
- :custom_filter,
- account: account,
- user: assignee,
- filter_type: :conversation,
- query: filter_query('display_id', [conversation.display_id.to_s], filter_operator: 'contains')
- )
-
- expect { described_class.new(account).build_filters_for!(assignee) }.not_to raise_error
-
- expect(store.filters_ready?(account.id, assignee.id)).to be(true)
- expect(redis_set_members(store.user_folder_key(account.id, assignee.id, invalid_filter.id))).to be_empty
- end
- end
-
def create_read_conversation
conversation = create(:conversation, account: account, inbox: inbox, agent_last_seen_at: 1.minute.from_now)
create(:message, account: account, inbox: inbox, conversation: conversation, message_type: :incoming)
@@ -257,32 +90,4 @@ RSpec.describe Conversations::UnreadCounts::Builder do
def redis_set_members(key)
Redis::Alfred.pipelined { |pipeline| pipeline.smembers(key) }.first
end
-
- def clear_user_filters_after_membership_write
- allow(store).to receive(:add_filter_memberships).and_wrap_original do |method, *args, **kwargs|
- method.call(*args, **kwargs)
- store.clear_user_filters!(account.id, assignee.id)
- end
- end
-
- def clear_filter_caches_after_membership_write
- allow(store).to receive(:add_filter_memberships).and_wrap_original do |method, *args, **kwargs|
- method.call(*args, **kwargs)
- store.clear_filter_caches!(account.id)
- end
- end
-
- def filter_query(attribute_key, values, filter_operator: 'equal_to')
- {
- payload: [
- {
- attribute_key: attribute_key,
- filter_operator: filter_operator,
- values: values,
- query_operator: nil,
- custom_attribute_type: ''
- }
- ]
- }
- end
end
diff --git a/spec/services/conversations/unread_counts/counter_spec.rb b/spec/services/conversations/unread_counts/counter_spec.rb
index c3c338355..723f2d437 100644
--- a/spec/services/conversations/unread_counts/counter_spec.rb
+++ b/spec/services/conversations/unread_counts/counter_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Conversations::UnreadCounts::Counter do
end
after do
- store.clear_all_account!(account.id)
+ store.clear_account!(account.id)
end
it 'builds the base cache on demand' do
@@ -32,7 +32,6 @@ RSpec.describe Conversations::UnreadCounts::Counter do
lock_key = "UNREAD_CONVERSATIONS::V1::ACCOUNT::#{account.id}::BUILD_LOCK::BASE"
lock_manager = instance_double(Redis::LockManager)
allow(Redis::LockManager).to receive(:new).and_return(lock_manager)
- allow(lock_manager).to receive(:with_lock).and_yield.and_return(true)
allow(lock_manager).to receive(:with_lock).with(lock_key, described_class::BUILD_LOCK_TTL).and_yield.and_return(true)
create_unread_conversation(account: account, inbox: visible_inbox, labels: [label.title], team: visible_team)
@@ -47,33 +46,13 @@ RSpec.describe Conversations::UnreadCounts::Counter do
counter = described_class.new(account: account, user: agent)
allow(Redis::LockManager).to receive(:new).and_return(lock_manager)
- allow(counter).to receive(:wait_for_cache_ready) do
- store.mark_base_ready!(account.id)
- store.mark_filters_ready!(account.id, agent.id)
- end
+ allow(counter).to receive(:wait_for_cache_ready) { store.mark_base_ready!(account.id) }
expect(Conversations::UnreadCounts::Builder).not_to receive(:new)
counter.perform
expect(counter).to have_received(:wait_for_cache_ready)
expect(store.base_ready?(account.id)).to be(true)
- expect(store.filters_ready?(account.id, agent.id)).to be(true)
- end
-
- it 'retries when a build finishes without marking the cache ready' do
- builder = instance_double(Conversations::UnreadCounts::Builder)
- attempts = 0
- allow(Conversations::UnreadCounts::Builder).to receive(:new).and_return(builder)
- allow(builder).to receive(:build_base!) do
- attempts += 1
- store.mark_base_ready!(account.id) if attempts == 2
- end
- allow(builder).to receive(:build_filters_for!) { store.mark_filters_ready!(account.id, agent.id) }
-
- described_class.new(account: account, user: agent).perform
-
- expect(builder).to have_received(:build_base!).twice
- expect(store.base_ready?(account.id)).to be(true)
end
it 'counts unread conversations only across inboxes visible to a normal agent' do
@@ -86,11 +65,7 @@ RSpec.describe Conversations::UnreadCounts::Counter do
all_count: 1,
inboxes: { visible_inbox.id.to_s => 1 },
labels: { label.id.to_s => 1 },
- teams: { visible_team.id.to_s => 1 },
- mentions_count: 0,
- participating_count: 0,
- unattended_count: 1,
- folders: {}
+ teams: { visible_team.id.to_s => 1 }
)
end
@@ -104,11 +79,7 @@ RSpec.describe Conversations::UnreadCounts::Counter do
all_count: 2,
inboxes: { visible_inbox.id.to_s => 1, hidden_inbox.id.to_s => 1 },
labels: { label.id.to_s => 2 },
- teams: { visible_team.id.to_s => 2 },
- mentions_count: 0,
- participating_count: 0,
- unattended_count: 2,
- folders: {}
+ teams: { visible_team.id.to_s => 2 }
)
end
@@ -121,46 +92,7 @@ RSpec.describe Conversations::UnreadCounts::Counter do
all_count: 1,
inboxes: { visible_inbox.id.to_s => 1 },
labels: {},
- teams: { visible_team.id.to_s => 1 },
- mentions_count: 0,
- participating_count: 0,
- unattended_count: 1,
- folders: {}
+ teams: { visible_team.id.to_s => 1 }
)
end
-
- it 'returns mention, participating, unattended, and valid folder unread counts for the user' do
- mentioned_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
- participating_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
- resolved_conversation = create_unread_conversation(account: account, inbox: visible_inbox)
- resolved_conversation.update!(status: :resolved)
- valid_folder = create(:custom_filter, account: account, user: agent, filter_type: :conversation, query: filter_query('status', ['resolved']))
- invalid_folder = create(:custom_filter, account: account, user: agent, filter_type: :conversation, query: filter_query('unknown', ['open']))
-
- create(:mention, account: account, conversation: mentioned_conversation, user: agent)
- create(:conversation_participant, account: account, conversation: participating_conversation, user: agent)
-
- result = described_class.new(account: account, user: agent).perform
-
- expect(result[:mentions_count]).to eq(1)
- expect(result[:participating_count]).to eq(1)
- expect(result[:unattended_count]).to eq(2)
- expect(result[:folders]).to eq(valid_folder.id.to_s => 1)
- expect(result[:folders]).not_to have_key(invalid_folder.id.to_s)
- expect(store.filters_ready?(account.id, agent.id)).to be(true)
- end
-
- def filter_query(attribute_key, values)
- {
- payload: [
- {
- attribute_key: attribute_key,
- filter_operator: 'equal_to',
- values: values,
- query_operator: nil,
- custom_attribute_type: ''
- }
- ]
- }
- end
end
diff --git a/spec/services/conversations/unread_counts/listener_spec.rb b/spec/services/conversations/unread_counts/listener_spec.rb
index 0cf31bd3c..fbb0a0835 100644
--- a/spec/services/conversations/unread_counts/listener_spec.rb
+++ b/spec/services/conversations/unread_counts/listener_spec.rb
@@ -21,22 +21,13 @@ RSpec.describe Conversations::UnreadCounts::Listener do
expect(notifier).to have_received(:perform)
end
- it 'clears user filter counts when a non-incoming message updates last activity' do
- account.enable_features!(:conversation_unread_counts)
+ it 'ignores outgoing message creation' do
message = create(:message, account: account, inbox: conversation.inbox, conversation: conversation, message_type: :outgoing)
event = Events::Base.new('message.created', Time.zone.now, message: message)
- allow(store).to receive(:clear_filter_caches!).and_return(true)
- allow(Rails.configuration.dispatcher).to receive(:dispatch)
listener.message_created(event)
expect(Conversations::UnreadCounts::Notifier).not_to have_received(:new)
- expect(store).to have_received(:clear_filter_caches!).with(account.id)
- expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
- 'conversation.unread_count_changed',
- kind_of(Time),
- conversation: conversation
- )
end
it 'ignores incoming message creation when conversation unread counts are disabled' do
@@ -61,7 +52,6 @@ RSpec.describe Conversations::UnreadCounts::Listener do
end
it 'refreshes unread counts when labels change' do
- account.enable_features!(:conversation_unread_counts)
changed_attributes = { label_list: [%w[old], %w[new]] }
event = Events::Base.new('conversation.updated', Time.zone.now, conversation: conversation, changed_attributes: changed_attributes)
@@ -71,43 +61,8 @@ RSpec.describe Conversations::UnreadCounts::Listener do
expect(notifier).to have_received(:perform)
end
- it 'clears user filter counts when a folder filter dimension changes' do
- account.enable_features!(:conversation_unread_counts)
+ it 'ignores conversation updates unrelated to unread count dimensions' do
event = Events::Base.new('conversation.updated', Time.zone.now, conversation: conversation, changed_attributes: { priority: [nil, 'high'] })
- allow(store).to receive(:clear_filter_caches!).and_return(true)
- allow(Rails.configuration.dispatcher).to receive(:dispatch)
-
- listener.conversation_updated(event)
-
- expect(Conversations::UnreadCounts::Notifier).not_to have_received(:new)
- expect(store).to have_received(:clear_filter_caches!).with(account.id)
- expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
- 'conversation.unread_count_changed',
- kind_of(Time),
- conversation: conversation
- )
- end
-
- it 'clears user filter counts when the conversation contact changes' do
- account.enable_features!(:conversation_unread_counts)
- event = Events::Base.new('conversation.contact_changed', Time.zone.now, conversation: conversation)
- allow(store).to receive(:clear_filter_caches!).and_return(true)
- allow(Rails.configuration.dispatcher).to receive(:dispatch)
-
- listener.conversation_contact_changed(event)
-
- expect(Conversations::UnreadCounts::Notifier).not_to have_received(:new)
- expect(store).to have_received(:clear_filter_caches!).with(account.id)
- expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
- 'conversation.unread_count_changed',
- kind_of(Time),
- conversation: conversation
- )
- end
-
- it 'ignores conversation updates without changed attributes' do
- account.enable_features!(:conversation_unread_counts)
- event = Events::Base.new('conversation.updated', Time.zone.now, conversation: conversation, changed_attributes: {})
listener.conversation_updated(event)
@@ -173,7 +128,7 @@ RSpec.describe Conversations::UnreadCounts::Listener do
conversation_data: conversation_data.stringify_keys
)
ensure
- store.clear_all_account!(account.id)
+ store.clear_account!(account.id)
end
def deleted_conversation_data(conversation)
diff --git a/spec/services/conversations/unread_counts/notifier_spec.rb b/spec/services/conversations/unread_counts/notifier_spec.rb
index 645c2bc17..1b35d37f6 100644
--- a/spec/services/conversations/unread_counts/notifier_spec.rb
+++ b/spec/services/conversations/unread_counts/notifier_spec.rb
@@ -29,18 +29,6 @@ RSpec.describe Conversations::UnreadCounts::Notifier do
expect(Rails.configuration.dispatcher).not_to have_received(:dispatch)
end
-
- it 'dispatches unread count changed event when user filter caches were cleared' do
- allow(Conversations::UnreadCounts::Store).to receive(:clear_filter_caches!).and_return(true)
-
- described_class.new(conversation).perform
-
- expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
- 'conversation.unread_count_changed',
- kind_of(Time),
- conversation: conversation
- )
- end
end
context 'when conversation unread counts feature is disabled' do
diff --git a/spec/services/conversations/unread_counts/refresher_spec.rb b/spec/services/conversations/unread_counts/refresher_spec.rb
index e961c21c3..5f361e7aa 100644
--- a/spec/services/conversations/unread_counts/refresher_spec.rb
+++ b/spec/services/conversations/unread_counts/refresher_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Conversations::UnreadCounts::Refresher do
let(:store) { Conversations::UnreadCounts::Store }
after do
- store.clear_all_account!(account.id)
+ store.clear_account!(account.id)
end
it 'does not update redis when unread caches are not ready' do
diff --git a/spec/services/conversations/unread_counts/store_spec.rb b/spec/services/conversations/unread_counts/store_spec.rb
index 9e1311727..fcf21c985 100644
--- a/spec/services/conversations/unread_counts/store_spec.rb
+++ b/spec/services/conversations/unread_counts/store_spec.rb
@@ -7,10 +7,9 @@ RSpec.describe Conversations::UnreadCounts::Store do
let(:user_id) { 4 }
let(:conversation_id) { 5 }
let(:team_id) { 6 }
- let(:other_user_id) { 8 }
after do
- described_class.clear_all_account!(account_id)
+ described_class.clear_account!(account_id)
end
describe 'key builders' do
@@ -46,69 +45,20 @@ RSpec.describe Conversations::UnreadCounts::Store do
'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::TEAM::6::INBOX::2::ASSIGNEE::4'
)
end
-
- it 'builds user filter keys using the Redis key naming convention' do
- expect(described_class.user_mentions_key(account_id, user_id)).to eq(
- 'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::MENTIONS'
- )
- expect(described_class.user_participating_key(account_id, user_id)).to eq(
- 'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::PARTICIPATING'
- )
- expect(described_class.user_unattended_key(account_id, user_id)).to eq(
- 'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::UNATTENDED'
- )
- expect(described_class.user_folder_key(account_id, user_id, 7)).to eq(
- 'UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::FOLDER::7'
- )
- end
end
describe 'ready markers' do
- it 'starts with all ready markers missing' do
+ it 'tracks base and assignment readiness independently' do
expect(described_class.base_ready?(account_id)).to be(false)
expect(described_class.assignment_ready?(account_id)).to be(false)
- expect(described_class.filters_ready?(account_id, user_id)).to be(false)
- end
- it 'tracks base, assignment, and user filter readiness independently' do
described_class.mark_base_ready!(account_id)
described_class.mark_assignment_ready!(account_id)
- described_class.mark_filters_ready!(account_id, user_id)
expect(described_class.base_ready?(account_id)).to be(true)
expect(described_class.assignment_ready?(account_id)).to be(true)
- expect(described_class.filters_ready?(account_id, user_id)).to be(true)
expect(ttl_for('UNREAD_CONVERSATIONS::V1::ACCOUNT::1::READY::BASE')).to be_within(5).of(Conversations::UnreadCounts::READY_TTL)
expect(ttl_for('UNREAD_CONVERSATIONS::V1::ACCOUNT::1::READY::ASSIGNMENT')).to be_within(5).of(Conversations::UnreadCounts::READY_TTL)
- expect(ttl_for('UNREAD_CONVERSATIONS::V1::ACCOUNT::1::USER::4::READY::FILTERS')).to be_within(5).of(
- Conversations::UnreadCounts::READY_TTL
- )
- end
-
- it 'tracks filter invalidation versions independently' do
- expect(described_class.filter_version_snapshot(account_id, user_id)).to eq(account: 0, user: 0)
-
- expect(described_class.clear_user_filters!(account_id, user_id)).to be(false)
-
- expect(described_class.filter_version_snapshot(account_id, user_id)).to eq(account: 0, user: 1)
- expect(ttl_for(user_filter_version_key)).to be_within(5).of(Conversations::UnreadCounts::SET_TTL)
-
- expect(described_class.clear_filter_caches!(account_id)).to be(false)
-
- expect(described_class.filter_version_snapshot(account_id, user_id)).to eq(account: 1, user: 1)
- expect(ttl_for(account_filter_version_key)).to be_within(5).of(Conversations::UnreadCounts::SET_TTL)
- end
-
- it 'marks filter caches ready only when the invalidation version is current' do
- version_snapshot = described_class.filter_version_snapshot(account_id, user_id)
-
- expect(described_class.mark_filters_ready_if_current!(account_id, user_id, version_snapshot: version_snapshot)).to be_truthy
- expect(described_class.filters_ready?(account_id, user_id)).to be(true)
-
- described_class.clear_user_filters!(account_id, user_id)
-
- expect(described_class.mark_filters_ready_if_current!(account_id, user_id, version_snapshot: version_snapshot)).to be(false)
- expect(described_class.filters_ready?(account_id, user_id)).to be(false)
end
end
@@ -200,94 +150,9 @@ RSpec.describe Conversations::UnreadCounts::Store do
expect(base_keys.map { |key| ttl_for(key) }).to all(be_within(5).of(Conversations::UnreadCounts::SET_TTL))
end
- it 'adds, counts, and clears user filter memberships' do
- described_class.add_filter_memberships(
- account_id: account_id,
- user_id: user_id,
- filters: {
- mentions: [conversation_id],
- participating: [conversation_id],
- unattended: [conversation_id]
- },
- folders: { 7 => [conversation_id] }
- )
- described_class.mark_filters_ready!(account_id, user_id)
-
- expect(described_class.counts_for_keys(user_filter_keys)).to eq(
- described_class.user_mentions_key(account_id, user_id) => 1,
- described_class.user_participating_key(account_id, user_id) => 1,
- described_class.user_unattended_key(account_id, user_id) => 1,
- described_class.user_folder_key(account_id, user_id, 7) => 1
- )
- expect(user_filter_keys.map { |key| ttl_for(key) }).to all(be_within(5).of(Conversations::UnreadCounts::SET_TTL))
-
- expect(described_class.clear_user_filters!(account_id, user_id)).to be(true)
-
- expect(described_class.filters_ready?(account_id, user_id)).to be(false)
- expect(described_class.counts_for_keys(user_filter_keys).values).to all(eq(0))
- end
-
- it 'preserves the user filter build lock when clearing one user filter cache' do
- described_class.add_filter_memberships(
- account_id: account_id,
- user_id: user_id,
- filters: {
- mentions: [conversation_id],
- participating: [conversation_id],
- unattended: [conversation_id]
- },
- folders: { 7 => [conversation_id] }
- )
- described_class.mark_filters_ready!(account_id, user_id)
- Redis::Alfred.set(user_filter_build_lock_key, 'locked')
-
- expect(described_class.clear_user_filters!(account_id, user_id)).to be(true)
-
- expect(Redis::Alfred.exists?(user_filter_build_lock_key)).to be(true)
- expect(described_class.filters_ready?(account_id, user_id)).to be(false)
- expect(described_class.counts_for_keys(user_filter_keys).values).to all(eq(0))
- end
-
- it 'preserves user filter build locks when clearing all account filter caches' do
- described_class.add_filter_memberships(
- account_id: account_id,
- user_id: user_id,
- filters: {
- mentions: [conversation_id],
- participating: [],
- unattended: []
- },
- folders: {}
- )
- described_class.add_filter_memberships(
- account_id: account_id,
- user_id: other_user_id,
- filters: {
- mentions: [conversation_id],
- participating: [],
- unattended: []
- },
- folders: {}
- )
- described_class.mark_filters_ready!(account_id, user_id)
- described_class.mark_filters_ready!(account_id, other_user_id)
- Redis::Alfred.set(user_filter_build_lock_key, 'locked')
- Redis::Alfred.set(user_filter_build_lock_key(other_user_id), 'locked')
-
- expect(described_class.clear_filter_caches!(account_id)).to be(true)
-
- expect(Redis::Alfred.exists?(user_filter_build_lock_key)).to be(true)
- expect(Redis::Alfred.exists?(user_filter_build_lock_key(other_user_id))).to be(true)
- expect(described_class.filters_ready?(account_id, user_id)).to be(false)
- expect(described_class.filters_ready?(account_id, other_user_id)).to be(false)
- expect(described_class.counts_for_keys([described_class.user_mentions_key(account_id, user_id)]).values).to all(eq(0))
- expect(described_class.counts_for_keys([described_class.user_mentions_key(account_id, other_user_id)]).values).to all(eq(0))
- end
-
- it 'clears account memberships without clearing user filter memberships' do
+ it 'clears all account memberships' do
described_class.mark_base_ready!(account_id)
described_class.mark_assignment_ready!(account_id)
- described_class.mark_filters_ready!(account_id, user_id)
described_class.add_base_membership(
account_id: account_id,
inbox_id: inbox_id,
@@ -303,69 +168,13 @@ RSpec.describe Conversations::UnreadCounts::Store do
team_id: team_id,
conversation_id: conversation_id
)
- described_class.add_filter_memberships(
- account_id: account_id,
- user_id: user_id,
- filters: {
- mentions: [conversation_id],
- participating: [],
- unattended: []
- },
- folders: {}
- )
- Redis::Alfred.set(user_filter_build_lock_key, 'locked')
described_class.clear_account!(account_id)
expect(described_class.base_ready?(account_id)).to be(false)
expect(described_class.assignment_ready?(account_id)).to be(false)
- expect(described_class.filters_ready?(account_id, user_id)).to be(true)
expect(described_class.counts_for_keys(base_keys).values).to all(eq(0))
expect(described_class.counts_for_keys(assignment_keys).values).to all(eq(0))
- expect(described_class.counts_for_keys([described_class.user_mentions_key(account_id, user_id)]).values).to all(eq(1))
- expect(Redis::Alfred.exists?(user_filter_build_lock_key)).to be(true)
- end
-
- it 'clears all account unread count keys' do
- described_class.mark_base_ready!(account_id)
- described_class.mark_assignment_ready!(account_id)
- described_class.mark_filters_ready!(account_id, user_id)
- described_class.add_base_membership(
- account_id: account_id,
- inbox_id: inbox_id,
- label_ids: [label_id],
- team_id: team_id,
- conversation_id: conversation_id
- )
- described_class.add_assignment_membership(
- account_id: account_id,
- inbox_id: inbox_id,
- label_ids: [label_id],
- assignee_id: user_id,
- team_id: team_id,
- conversation_id: conversation_id
- )
- described_class.add_filter_memberships(
- account_id: account_id,
- user_id: user_id,
- filters: {
- mentions: [conversation_id],
- participating: [],
- unattended: []
- },
- folders: {}
- )
- Redis::Alfred.set(user_filter_build_lock_key, 'locked')
-
- described_class.clear_all_account!(account_id)
-
- expect(described_class.base_ready?(account_id)).to be(false)
- expect(described_class.assignment_ready?(account_id)).to be(false)
- expect(described_class.filters_ready?(account_id, user_id)).to be(false)
- expect(described_class.counts_for_keys(base_keys).values).to all(eq(0))
- expect(described_class.counts_for_keys(assignment_keys).values).to all(eq(0))
- expect(described_class.counts_for_keys([described_class.user_mentions_key(account_id, user_id)]).values).to all(eq(0))
- expect(Redis::Alfred.exists?(user_filter_build_lock_key)).to be(false)
end
end
@@ -385,27 +194,6 @@ RSpec.describe Conversations::UnreadCounts::Store do
]
end
- def user_filter_keys(filter_user_id = user_id)
- [
- described_class.user_mentions_key(account_id, filter_user_id),
- described_class.user_participating_key(account_id, filter_user_id),
- described_class.user_unattended_key(account_id, filter_user_id),
- described_class.user_folder_key(account_id, filter_user_id, 7)
- ]
- end
-
- def user_filter_build_lock_key(filter_user_id = user_id)
- format(Redis::Alfred::UNREAD_CONVERSATIONS_USER_FILTERS_BUILD_LOCK, account_id: account_id, user_id: filter_user_id)
- end
-
- def account_filter_version_key
- format(Redis::Alfred::UNREAD_CONVERSATIONS_FILTERS_VERSION, account_id: account_id)
- end
-
- def user_filter_version_key(filter_user_id = user_id)
- format(Redis::Alfred::UNREAD_CONVERSATIONS_USER_FILTERS_VERSION, account_id: account_id, user_id: filter_user_id)
- end
-
def ttl_for(key)
Redis::Alfred.ttl(key)
end
diff --git a/spec/services/conversations/unread_counts/user_filter_notifier_spec.rb b/spec/services/conversations/unread_counts/user_filter_notifier_spec.rb
deleted file mode 100644
index 1d898b103..000000000
--- a/spec/services/conversations/unread_counts/user_filter_notifier_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe Conversations::UnreadCounts::UserFilterNotifier do
- let(:account) { create(:account) }
- let(:user) { create(:user, account: account) }
- let(:store) { Conversations::UnreadCounts::Store }
-
- after do
- store.clear_all_account!(account.id)
- end
-
- it 'clears the user filter cache and dispatches an unread count refresh event' do
- account.enable_features!(:conversation_unread_counts)
- store.mark_filters_ready!(account.id, user.id)
- allow(Rails.configuration.dispatcher).to receive(:dispatch)
-
- described_class.new(account: account, user: user).perform
-
- expect(store.filters_ready?(account.id, user.id)).to be(false)
- expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(
- 'conversation.unread_count_changed',
- kind_of(Time),
- account: account,
- user: user
- )
- end
-
- it 'does nothing when conversation unread counts are disabled' do
- store.mark_filters_ready!(account.id, user.id)
- allow(Rails.configuration.dispatcher).to receive(:dispatch)
-
- described_class.new(account: account, user: user).perform
-
- expect(store.filters_ready?(account.id, user.id)).to be(true)
- expect(Rails.configuration.dispatcher).not_to have_received(:dispatch)
- end
-end
From 5ce6e00730d6b0f0ec6eb1b6c68178b2cfdd2078 Mon Sep 17 00:00:00 2001
From: Sony Mathew <2040199+sony-mathew@users.noreply.github.com>
Date: Wed, 17 Jun 2026 18:06:42 +0530
Subject: [PATCH 20/26] Bump version to 4.15.1
---
VERSION_CW | 2 +-
config/app.yml | 2 +-
package.json | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/VERSION_CW b/VERSION_CW
index 5c517bf11..fb0557132 100644
--- a/VERSION_CW
+++ b/VERSION_CW
@@ -1 +1 @@
-4.15.0
+4.15.1
diff --git a/config/app.yml b/config/app.yml
index c2c192018..a55b621f6 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
shared: &shared
- version: '4.15.0'
+ version: '4.15.1'
development:
<<: *shared
diff --git a/package.json b/package.json
index b8ab60839..65dd48d27 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@chatwoot/chatwoot",
- "version": "4.15.0",
+ "version": "4.15.1",
"license": "MIT",
"scripts": {
"eslint": "eslint app/**/*.{js,vue}",
From ac153394566de1aed26a56fb9aaa8ff72019659f Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Fri, 19 Jun 2026 12:16:47 +0530
Subject: [PATCH 21/26] fix: Resolve Firefox input issues and persist advanced
filters (#14781)
# Pull Request Template
## Description
This PR fixes a few issues in Global Search and removes a non-functional
control.
* Fixes an issue in Firefox where characters could be dropped while
typing in the search input. The search now uses the latest input value
directly, preventing searches from running one character behind.
* Removes a stale query sync in `SearchHeader` that could overwrite
recently typed characters during the debounce window, causing the input
to appear out of sync.
* Fixes advanced search filters being removed from the URL on page
reload. The search page now waits for account data to load before
parsing URL parameters, ensuring agent, inbox, and date range filters
are preserved.
* Removes the non-functional "Sort by relevance" button from the search
tabs bar, as it was disabled and had no effect.
Fixes https://github.com/chatwoot/chatwoot/issues/14684
[CW-7305](https://linear.app/chatwoot/issue/CW-7305/global-search-drops-characters-while-typing-in-firefox-query-truncated)
[CW-7370](https://linear.app/chatwoot/issue/CW-7370/remove-non-functional-relevance-placeholder-button-from-global-search)
## Type of change
- [x] Bug fix (non-breaking change which fixes an issue)
## How Has This Been Tested?
### Screencast
**Before**
https://github.com/user-attachments/assets/48d72a4e-20f4-4f24-91f4-2c9a9c065eba
**After**
https://github.com/user-attachments/assets/0e41a803-b4fd-410d-a739-549f72d418d6
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [x] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---
.../search/components/SearchHeader.vue | 12 +------
.../modules/search/components/SearchInput.vue | 9 +++--
.../modules/search/components/SearchTabs.vue | 13 --------
.../modules/search/components/SearchView.vue | 33 ++++++++++++-------
4 files changed, 28 insertions(+), 39 deletions(-)
diff --git a/app/javascript/dashboard/modules/search/components/SearchHeader.vue b/app/javascript/dashboard/modules/search/components/SearchHeader.vue
index 08d4c0c7a..1de642fbe 100644
--- a/app/javascript/dashboard/modules/search/components/SearchHeader.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchHeader.vue
@@ -1,5 +1,5 @@
diff --git a/app/javascript/dashboard/modules/search/components/SearchInput.vue b/app/javascript/dashboard/modules/search/components/SearchInput.vue
index 3edd79fe0..de2db176f 100644
--- a/app/javascript/dashboard/modules/search/components/SearchInput.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchInput.vue
@@ -30,10 +30,13 @@ const debouncedEmit = debounce(
500
);
-const onInput = () => {
- debouncedEmit(searchQuery.value);
+const onInput = e => {
+ // Use the DOM value, not searchQuery.value: the defineModel ref updates a tick
+ // later, so reading it back here lags one character behind.
+ const value = e.target.value;
+ debouncedEmit(value);
- if (searchQuery.value.trim()) {
+ if (value.trim()) {
showRecentSearches.value = false;
} else if (isInputFocused.value) {
showRecentSearches.value = true;
diff --git a/app/javascript/dashboard/modules/search/components/SearchTabs.vue b/app/javascript/dashboard/modules/search/components/SearchTabs.vue
index 86e40df57..1a0fea65c 100644
--- a/app/javascript/dashboard/modules/search/components/SearchTabs.vue
+++ b/app/javascript/dashboard/modules/search/components/SearchTabs.vue
@@ -1,8 +1,6 @@
@@ -39,12 +59,21 @@ const localeCount = computed(() => props.locales?.length);
{{ $t('HELP_CENTER.LOCALES_PAGE.LOCALES_COUNT', localeCount) }}
-
+ {{ label }}
-
+
+
+
+