fix: Cron job for clearing OEmbed cache isn't working (#31336)

.changeset/selfish-rice-wave.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/model-typings": patch
+---
+
+Fixed issue with OEmbed cache not being cleared daily

apps/meteor/client/views/admin/settings/inputs/ActionSettingInput.tsx

@@ -19,9 +19,10 @@ function ActionSettingInput({ _id, actionText, value, disabled, sectionChanged }
 
 	const handleClick = async (): Promise<void> => {
 		try {
-			const data: { message: TranslationKey; params: string[] } = await actionMethod();
+			const data: { message: TranslationKey; params?: string[] } = await actionMethod();
 
-			dispatchToastMessage({ type: 'success', message: t(data.message, ...data.params) });
+			const params = data.params || [];
+			dispatchToastMessage({ type: 'success', message: t(data.message, ...params) });
 		} catch (error) {
 			dispatchToastMessage({ type: 'error', message: error });
 		}

apps/meteor/server/cron/oembed.ts

@@ -1,6 +1,7 @@
 import { cronJobs } from '@rocket.chat/cron';
-import { Meteor } from 'meteor/meteor';
+
+import { executeClearOEmbedCache } from '../methods/OEmbedCacheCleanup';
 
 export async function oembedCron(): Promise<void> {
-	await cronJobs.add('Cleanup OEmbed cache', '24 2 * * *', async () => Meteor.callAsync('OEmbedCacheCleanup'));
+	await cronJobs.add('Cleanup OEmbed cache', '24 2 * * *', async () => executeClearOEmbedCache());
 }

apps/meteor/server/methods/OEmbedCacheCleanup.ts

@@ -12,6 +12,13 @@ declare module '@rocket.chat/ui-contexts' {
 	}
 }
 
+export const executeClearOEmbedCache = async () => {
+	const date = new Date();
+	const expirationDays = settings.get<number>('API_EmbedCacheExpirationDays');
+	date.setDate(date.getDate() - expirationDays);
+	return OEmbedCache.removeBeforeDate(date);
+};
+
 Meteor.methods<ServerMethods>({
 	async OEmbedCacheCleanup() {
 		const uid = Meteor.userId();
@@ -21,10 +28,7 @@ Meteor.methods<ServerMethods>({
 			});
 		}
 
-		const date = new Date();
-		const expirationDays = settings.get<number>('API_EmbedCacheExpirationDays');
-		date.setDate(date.getDate() - expirationDays);
-		await OEmbedCache.removeAfterDate(date);
+		await executeClearOEmbedCache();
 		return {
 			message: 'cache_cleared',
 		};

apps/meteor/server/models/raw/OEmbedCache.ts

@@ -23,7 +23,7 @@ export class OEmbedCacheRaw extends BaseRaw<IOEmbedCache> implements IOEmbedCach
 		return record;
 	}
 
-	removeAfterDate(date: Date): Promise<DeleteResult> {
+	removeBeforeDate(date: Date): Promise<DeleteResult> {
 		const query = {
 			updatedAt: {
 				$lte: date,

packages/model-typings/src/models/IOEmbedCacheModel.ts

@@ -6,5 +6,5 @@ import type { IBaseModel } from './IBaseModel';
 export interface IOEmbedCacheModel extends IBaseModel<IOEmbedCache> {
 	createWithIdAndData(_id: string, data: any): Promise<IOEmbedCache>;
 
-	removeAfterDate(date: Date): Promise<DeleteResult>;
+	removeBeforeDate(date: Date): Promise<DeleteResult>;
 }