Skip to content

fix: thumbnails are not removed when a file is deleted automatically on user removal #38105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 4 commits into from
Jan 9, 2026
Merged

fix: thumbnails are not removed when a file is deleted automatically on user removal #38105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35a2f6d
chore: use `IMessage.files` to determine files to be deleted along wi…
pierre-lehnen-rc Jan 8, 2026
d430f6a
no Promise.all
pierre-lehnen-rc Jan 8, 2026
63fcffc
changeset
pierre-lehnen-rc Jan 8, 2026
bd502ff
Merge branch 'develop' into chore/user-delete-all-message-files
kodiakhq[bot] Jan 9, 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
7 changes: 7 additions & 0 deletions .changeset/stupid-keys-double.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@rocket.chat/model-typings': patch
'@rocket.chat/models': patch
'@rocket.chat/meteor': patch
---

Fixes user deletion not removing thumbnails of images sent by the deleted user
14 changes: 10 additions & 4 deletions apps/meteor/app/lib/server/functions/deleteUser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,17 @@ export async function deleteUser(userId: string, confirmRelinquish = false, dele
const store = FileUpload.getStore('Uploads');
const cursor = Messages.findFilesByUserId(userId);

for await (const { file } of cursor) {
if (!file) {
continue;
for await (const { file, files } of cursor) {
const fileIds = files?.map(({ _id }) => _id) || [];
for await (const fileId of fileIds) {
if (fileId) {
await store.deleteById(fileId);
}
}

if (file?._id && !fileIds.includes(file._id)) {
await store.deleteById(file._id);
}
await store.deleteById(file._id);
}

await Messages.removeByUserId(userId);
Expand Down
2 changes: 1 addition & 1 deletion packages/model-typings/src/models/IMessagesModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export interface IMessagesModel extends IBaseModel<IMessage> {
findByMention(username: string, options?: FindOptions<IMessage>): FindCursor<IMessage>;
findVisibleThreadByThreadId(tmid: string, options?: FindOptions<IMessage>): FindCursor<IMessage>;

findFilesByUserId(userId: string, options?: FindOptions<IMessage>): FindCursor<Pick<IMessage, 'file'>>;
findFilesByUserId(userId: string, options?: FindOptions<IMessage>): FindCursor<Pick<IMessage, 'file' | 'files'>>;
findVisibleByIds(ids: string[], options?: FindOptions<IMessage>): FindCursor<IMessage>;
findVisibleByRoomIdNotContainingTypes(
roomId: string,
Expand Down
6 changes: 3 additions & 3 deletions packages/models/src/models/Messages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,12 +768,12 @@ export class MessagesRaw extends BaseRaw<IMessage> implements IMessagesModel {
return this.find(query, options);
}

findFilesByUserId(userId: string, options: FindOptions<IMessage> = {}): FindCursor<Pick<IMessage, 'file'>> {
findFilesByUserId(userId: string, options: FindOptions<IMessage> = {}): FindCursor<Pick<IMessage, 'file' | 'files'>> {
const query = {
'u._id': userId,
'file._id': { $exists: true },
'$or': [{ 'file._id': { $exists: true } }, { 'files._id': { $exists: true } }],
};
return this.find(query, { projection: { 'file._id': 1 }, ...options });
return this.find(query, { projection: { 'file._id': 1, 'files._id': 1 }, ...options });
}

findFilesByRoomIdPinnedTimestampAndUsers(
Expand Down
Loading