Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
21475d5
feat: add scheduled messages feature
Polinarr60 Feb 15, 2026
25d64a3
feat: add scheduled messages feature
Polinarr60 Feb 15, 2026
f4d86a7
add important message marker permission
kzkken Feb 25, 2026
d8e4055
add important message marker permission
kzkken Feb 25, 2026
cb0fa66
updates some permission
kzkken Mar 17, 2026
956d237
iteration2: button on the toolbar
kzkken Mar 24, 2026
f057936
updates iteration2
kzkken Apr 6, 2026
1a957bd
adding a button (mark as read/message read) below the message
kzkken Apr 16, 2026
5c933db
feat: Add draft message badge in sidebar
Polinarr60 Apr 18, 2026
4714e1a
list of those who read it has been added
kzkken Apr 18, 2026
2f05320
feat: Add draft message badge in sidebar
Polinarr60 Apr 18, 2026
2866775
Added support for nested lists in markdown messages
Polinarr60 Apr 19, 2026
412fea9
feat/Adds emoji restriction feature for non-admin users
Polinarr60 Apr 21, 2026
e1ea1bb
iteration 4: logging
kzkken Apr 22, 2026
19e9d5e
Added support for nested lists in markdown messages
Polinarr60 Apr 22, 2026
e5fa4d4
Merge branch 'develop' into fix/markdown-nested-lists
Polinarr60 Apr 22, 2026
112980b
Adds emoji restriction feature for non-admin users
Polinarr60 Apr 22, 2026
93ff532
Merge branch 'develop' into feat/emoji-restrict
Polinarr60 Apr 22, 2026
15dd8ee
Merge branch 'develop' into feat/draft-message-badge
Polinarr60 Apr 22, 2026
4996569
Merge branch 'develop' into feat/draft-message-badge
Polinarr60 Apr 22, 2026
c255954
Adds emoji restriction feature for non-admin users
Polinarr60 Apr 22, 2026
0291f22
Merge branch 'develop' into feat/emoji-restrict
Polinarr60 Apr 22, 2026
f2d0e07
Adds emoji restriction feature for non-admin users
Polinarr60 Apr 22, 2026
e62bb94
Adds emoji restriction feature for non-admin users
Polinarr60 Apr 22, 2026
0b3be1f
Adds emoji restriction feature for non-admin users
Polinarr60 Apr 22, 2026
6da9c8a
Merge branch 'develop' into feat/emoji-restrict
Polinarr60 Apr 22, 2026
014c086
merge main + some updates
kzkken Apr 23, 2026
022ab7a
some updates
kzkken May 3, 2026
8c3128d
feat: add message read count & read list
qmaster0803 May 24, 2026
0db6c61
fix: remove debug prints
qmaster0803 May 24, 2026
95c6cff
Merge branch 'develop' into feat/read-count
Polinarr60 May 25, 2026
7201571
fix list
kzkken May 22, 2026
7e3649b
Added important messages
kzkken May 25, 2026
92645a6
fix coderabbit
kzkken May 25, 2026
b0452ff
fix yarn
kzkken May 26, 2026
609bf88
fix coderabbit again
kzkken May 26, 2026
5221f65
fix ai
kzkken May 26, 2026
2ba5a89
fix: apply suggested changes
qmaster0803 May 27, 2026
d5a1589
feat(sidebar): add personal room categories
artyoomi Mar 24, 2026
58ddbb0
fix: make "Create user room category" button bigger
artyoomi May 25, 2026
5d35065
fix: disable rate limit for user-room-categories
artyoomi May 26, 2026
e50a4c8
fix: address PR review issues for user-room-categories
artyoomi May 26, 2026
0f5da65
fix: atomic updates and built-in key collision
artyoomi May 27, 2026
ce66049
fix: forbid duplicates in names and make ops atomic
artyoomi May 28, 2026
38d371b
fix: make same anumation of categories of kebab menu
artyoomi May 28, 2026
d539e19
Upgrade feature
Oct 11, 2026
d42f99f
Merge branch 'develop' into feat/emoji-restrict
Oct 11, 2026
ca51f6c
Merge branch 'develop' into feat/emoji-restrict
Oct 11, 2026
e9cca39
Merge branch 'develop' into feat/delayed-messages
Oct 11, 2026
5833a85
Added changes
Oct 11, 2026
995c069
Merge branch 'develop' into feat/draft-message-badge
Oct 11, 2026
375d79e
Added chagnes
Oct 11, 2026
1b8f0f0
Added changes
Oct 11, 2026
81af673
Merge branch 'develop' into fix/markdown-nested-lists
Oct 11, 2026
52e8c33
Added changes
Oct 11, 2026
e0b645a
Merge branch 'develop' into feat/read-count
Oct 11, 2026
1aa37ea
Merge branch 'fix/markdown-nested-lists' into release
Oct 11, 2026
6057b81
Merge branch 'feat/draft-message-badge' into release
Oct 11, 2026
6e38ff2
Merge branch 'feat/emoji-restrict' into release
Oct 11, 2026
a662479
Added changes
Oct 11, 2026
f6acc65
Merge branch 'feat/delayed-messages' into release
Nov 15, 2026
0314c79
Merge branch 'develop' into feat/read-button
Nov 15, 2026
7affe8c
Merge branch 'feat/read-button' into release
Nov 15, 2026
3ca6d6e
Merge branch 'develop' into feat/custom-sidebar-sections
Nov 15, 2026
a53671e
Merge branch 'feat/custom-sidebar-sections' into release
Nov 15, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .changeset/real-ties-unite.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
'@rocket.chat/message-parser': minor
'@rocket.chat/pdf-worker': minor
'@rocket.chat/gazzodown': minor
'@rocket.chat/meteor': minor
---

Add support for nested/multi-level lists in markdown
6 changes: 6 additions & 0 deletions .changeset/soft-berries-deliver.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/i18n': minor
'@rocket.chat/meteor': minor
---

Added draft message indicator in sidebar to help users identify rooms with unsaved messages
10 changes: 10 additions & 0 deletions .changeset/tasty-crabs-exercise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
'@rocket.chat/model-typings': minor
'@rocket.chat/core-typings': minor
'@rocket.chat/rest-typings': minor
'@rocket.chat/models': minor
'@rocket.chat/i18n': minor
'@rocket.chat/meteor': minor
---

Add scheduled messages feature with schedule button, modal UI, API endpoints, and automated message delivery
6 changes: 6 additions & 0 deletions .changeset/three-roses-sell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/i18n': minor
'@rocket.chat/meteor': minor
---

Add ability to restrict specific emojis from being used by regular users through admin panel
9 changes: 9 additions & 0 deletions .changeset/wicked-seals-rescue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@rocket.chat/model-typings': minor
'@rocket.chat/rest-typings': minor
'@rocket.chat/ui-client': minor
'@rocket.chat/models': minor
'@rocket.chat/meteor': minor
---

Added per-message read tracking that shows how many room members have read each message and who they are.
7 changes: 7 additions & 0 deletions .changeset/witty-dancers-count.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@rocket.chat/core-typings': minor
'@rocket.chat/i18n': minor
'@rocket.chat/meteor': minor
---

Added important messages: permissions and a room role to mark messages as important, a composer toggle when sending, read acknowledgment (“Mark as read”), and a readers list for moderators.
8 changes: 8 additions & 0 deletions .patch-ci.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"tests": [
"yarn workspace @rocket.chat/meteor exec ./node_modules/.bin/mocha --config ./.mocharc.base.json tests/unit/lib/restrictedEmojis.spec.ts tests/unit/server/lib/messaging/validateRestrictedEmojis.spec.ts tests/unit/app/emoji/restrictedEmojiPicker.spec.ts tests/unit/app/read-counter/getAccessibleMessageForReadCounter.spec.ts tests/unit/app/read-counter/getMessageReadCount.spec.ts",
"yarn workspace @rocket.chat/message-parser exec jest tests/orderedList.test.ts tests/unorderedList.test.ts",
"yarn workspace @rocket.chat/gazzodown exec jest src/blocks/splitListItemRuns.spec.ts",
"yarn workspace @rocket.chat/meteor exec ./node_modules/.bin/mocha --config ./.mocharc.base.json tests/unit/server/cron/scheduledMessages.spec.ts"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import { Authorization } from '@rocket.chat/core-services';
import type { IMessage, IRoom, IUser } from '@rocket.chat/core-typings';
import { Messages, Rooms } from '@rocket.chat/models';

type AccessibleMessageForReadCounter = {
message: Pick<IMessage, '_id' | 'rid' | 'ts'> & { u?: Pick<IUser, '_id'> };
room: Pick<IRoom, '_id' | 't'>;
};

export const getAccessibleMessageForReadCounter = async (
messageId: IMessage['_id'],
userId: IUser['_id'],
): Promise<AccessibleMessageForReadCounter | null> => {
const message = await Messages.findOneById(messageId, {
projection: { _id: 1, rid: 1, ts: 1, 'u._id': 1 },
});

if (!message) {
return null;
}

const room = await Rooms.findOneById(message.rid, {
projection: { _id: 1, t: 1 },
});

if (!room || room.t === 'd') {
return null;
}

if (!(await Authorization.canReadRoom(room, { _id: userId }))) {
return null;
}

return { message, room };
};
25 changes: 25 additions & 0 deletions apps/meteor/app/read-counter/server/getMessageReadCount.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import type { IMessage, IUser } from '@rocket.chat/core-typings';
import { Subscriptions } from '@rocket.chat/models';

import { getAccessibleMessageForReadCounter } from './getAccessibleMessageForReadCounter';

export const getMessageReadCount = async (
messageId: IMessage['_id'],
userId: IUser['_id'],
): Promise<{ readCount: number } | null> => {
const accessible = await getAccessibleMessageForReadCounter(messageId, userId);

if (!accessible) {
return null;
}

const { message } = accessible;

if (!message.ts) {
return { readCount: 0 };
}

const readCount = await Subscriptions.countReadersByRoomIdAndMessageTs(message.rid, message.ts, message.u?._id);

return { readCount };
};
26 changes: 26 additions & 0 deletions apps/meteor/app/read-counter/server/getMessageReaders.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import type { IMessage, IUser } from '@rocket.chat/core-typings';
import { Subscriptions } from '@rocket.chat/models';

import { getAccessibleMessageForReadCounter } from './getAccessibleMessageForReadCounter';

export const getMessageReaders = async (
messageId: IMessage['_id'],
userId: IUser['_id'],
limit = 50,
): Promise<{ readers: Array<Pick<IUser, '_id' | 'name' | 'username'>> } | null> => {
const accessible = await getAccessibleMessageForReadCounter(messageId, userId);

if (!accessible) {
return null;
}

const { message } = accessible;

if (!message.ts) {
return { readers: [] };
}

const readers = await Subscriptions.findReaderUsersByRoomIdAndMessageTs(message.rid, message.ts, message.u?._id, limit);

return { readers };
};
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { type RoomType, isDirectMessageRoom } from '@rocket.chat/core-typings';
import { AutoComplete, Box, Option, OptionAvatar, OptionContent, Chip } from '@rocket.chat/fuselage';
import { AutoComplete, Box, Chip, Option, OptionAvatar, OptionContent } from '@rocket.chat/fuselage';
import type { SelectOption } from '@rocket.chat/fuselage';
import { MultiSelectFiltered } from '@rocket.chat/fuselage-forms';
import { useDebouncedValue, useStableArray } from '@rocket.chat/fuselage-hooks';
import { escapeRegExp } from '@rocket.chat/tools';
import { RoomAvatar } from '@rocket.chat/ui-avatar';
import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
import { useUser, useUserSubscriptions } from '@rocket.chat/ui-contexts';
import type { ComponentProps } from 'react';
import type { ComponentProps, MouseEventHandler } from 'react';
import { memo, useMemo, useState } from 'react';

import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
Expand All @@ -15,15 +17,19 @@ export type UserAndRoomAutoCompleteMultipleProps = Omit<ComponentProps<typeof Au
limit?: number;
excludeTypes?: RoomType[];
allowReadOnly?: boolean;
keepDropdownOpenOnSelect?: boolean;
};

type OptionType = {
type RoomOptionLabel = {
name: string | undefined;
avatarETag: string | undefined;
type: RoomType;
searchLabel: string;
};

type AutoCompleteOption = {
value: string;
label: {
name: string | undefined;
avatarETag: string | undefined;
type: RoomType;
};
label: RoomOptionLabel;
}[];

const toOption = (room: SubscriptionWithRoom) => ({
Expand All @@ -32,15 +38,27 @@ const toOption = (room: SubscriptionWithRoom) => ({
name: room.fname || room.name,
avatarETag: room.avatarETag,
type: room.t,
searchLabel: [room.fname, room.name].filter(Boolean).join(' ') || room.rid,
},
});

type RoomOptionProps = {
role?: string;
value: string;
label: string;
selected?: boolean;
focus?: boolean;
disabled?: boolean;
onMouseDown: MouseEventHandler;
};

const UserAndRoomAutoCompleteMultiple = ({
value,
onChange,
limit,
excludeTypes,
allowReadOnly = false,
keepDropdownOpenOnSelect = false,
...props
}: UserAndRoomAutoCompleteMultipleProps) => {
const user = useUser();
Expand All @@ -59,25 +77,27 @@ const UserAndRoomAutoCompleteMultiple = ({
const selectedRooms = useUserSubscriptions(
useMemo(() => ({ rid: { $in: selectedIds }, $or: filterConditions }), [filterConditions, selectedIds]),
);
const allSelectedRooms = useUserSubscriptions(useMemo(() => ({ rid: { $in: selectedIds } }), [selectedIds]));

const rooms = useUserSubscriptions(
...useMemo<Parameters<typeof useUserSubscriptions>>(
() => [
{
open: { $ne: false },
rid: { $nin: selectedIds },
$or: filterConditions,
},
// We are using a higher limit here to take advantage of the amount that
// will be filtered below into a smaller set respecting the limit prop.
{ limit: 100 },
{ limit: 100 + selectedIds.length },
],
[filterConditions, selectedIds],
),
);

const options = useMemo(() => {
const searchOptions = rooms.reduce<OptionType>((acc, room) => {
const options = useMemo<AutoCompleteOption>(() => {
const searchOptions = rooms.reduce<AutoCompleteOption>((acc, room) => {
if (selectedIds.includes(room.rid)) return acc;

if (acc.length === limit) return acc;

if (excludeTypes?.includes(room.t)) return acc;
Expand All @@ -96,6 +116,72 @@ const UserAndRoomAutoCompleteMultiple = ({
return [...searchOptions, ...selectedRooms.map(toOption)];
}, [allowReadOnly, excludeTypes, limit, rooms, selectedIds, selectedRooms, user]);

const multiSelectRooms = useMemo(() => {
const roomsById = new Map([...rooms, ...allSelectedRooms].map((room) => [room.rid, room] as const));
return [...roomsById.values()];
}, [allSelectedRooms, rooms]);

const multiSelectOptions = useMemo<SelectOption[]>(() => {
return multiSelectRooms.map((room): SelectOption => [room.rid, toOption(room).label.searchLabel]);
}, [multiSelectRooms]);

const multiSelectRoomLabels = useMemo(
() =>
new Map(
multiSelectRooms.map(
(room) => [room.rid, { name: room.fname || room.name || room.rid, avatarETag: room.avatarETag, type: room.t }] as const,
),
),
[multiSelectRooms],
);

if (keepDropdownOpenOnSelect) {
return (
<MultiSelectFiltered
{...props}
value={Array.isArray(value) ? value : []}
onChange={onChange}
filter={filter}
setFilter={setFilter}
renderSelected={({ value, label, onMouseDown }: { value: string; label: string; onMouseDown: MouseEventHandler }) => {
const roomLabel = multiSelectRoomLabels.get(value);

return (
<Chip height='x20' value={value} onMouseDown={onMouseDown} marginInlineEnd={4}>
{roomLabel && (
<RoomAvatar
size='x20'
room={{ name: roomLabel.name, avatarETag: roomLabel.avatarETag, type: roomLabel.type, _id: value }}
/>
)}
<Box is='span' margin='none' marginInlineStart={4}>
{roomLabel?.name ?? label}
</Box>
</Chip>
);
}}
renderItem={({ value, label, ...props }: RoomOptionProps) => {
const roomLabel = multiSelectRoomLabels.get(value);

return (
<Option key={value} value={value} {...props}>
<OptionAvatar>
{roomLabel && (
<RoomAvatar
size='x20'
room={{ name: roomLabel.name, avatarETag: roomLabel.avatarETag, type: roomLabel.type, _id: value }}
/>
)}
</OptionAvatar>
<OptionContent>{roomLabel?.name ?? label}</OptionContent>
</Option>
);
}}
options={multiSelectOptions}
/>
);
}

return (
<AutoComplete
{...props}
Expand All @@ -106,7 +192,7 @@ const UserAndRoomAutoCompleteMultiple = ({
multiple
renderSelected={({ selected: { value, label }, onRemove, ...props }) => (
<Chip {...props} height='x20' value={value} onClick={onRemove} marginInlineEnd={4}>
<RoomAvatar size='x20' room={{ ...label, _id: value }} />
<RoomAvatar size='x20' room={{ name: label.name, avatarETag: label.avatarETag, type: label.type, _id: value }} />
<Box is='span' margin='none' marginInlineStart={4}>
{label.name}
</Box>
Expand All @@ -115,7 +201,7 @@ const UserAndRoomAutoCompleteMultiple = ({
renderItem={({ value, label, ...props }) => (
<Option key={value} {...props}>
<OptionAvatar>
<RoomAvatar size='x20' room={{ ...label, _id: value }} />
<RoomAvatar size='x20' room={{ name: label.name, avatarETag: label.avatarETag, type: label.type, _id: value }} />
</OptionAvatar>
<OptionContent>{label.name}</OptionContent>
</Option>
Expand Down
Loading