fix: message sent count

Co-authored-by: Copilot <copilot@github.com>

Author: d-gubert

apps/meteor/app/lib/server/lib/processDirectEmail.ts

@@ -109,9 +109,6 @@ export const processDirectEmail = async function (email: ParsedMail): Promise<vo
 		}
 	}
 
-	metrics.messagesSent.inc(); // TODO This line needs to be moved to it's proper place. See the comments on: https://github.com/RocketChat/Rocket.Chat/pull/5736
-	metrics.messagesSentTotal.inc();
-
 	const message: Pick<IMessage, 'ts' | 'msg' | 'groupable' | 'rid' | 'sentByEmail' | 'tmid'> = {
 		ts: tsDiff < 10000 ? ts : new Date(),
 		msg,
@@ -121,5 +118,10 @@ export const processDirectEmail = async function (email: ParsedMail): Promise<vo
 		rid: prevMessage.rid,
 	};
 
-	return sendMessage(user, message, roomInfo);
+	const result = await sendMessage(user, message, roomInfo);
+
+	metrics.messagesSent.inc();
+	metrics.messagesSentTotal.inc();
+
+	return result;
 };

apps/meteor/app/lib/server/methods/sendMessage.ts

@@ -105,9 +105,12 @@ export async function executeSendMessage(
 			}
 		}
 
-		metrics.messagesSent.inc(); // TODO This line needs to be moved to it's proper place. See the comments on: https://github.com/RocketChat/Rocket.Chat/pull/5736
+		const result = await sendMessage(user, message, room, { previewUrls: extraInfo?.previewUrls });
+
+		metrics.messagesSent.inc();
 		metrics.messagesSentTotal.inc();
-		return await sendMessage(user, message, room, { previewUrls: extraInfo?.previewUrls });
+
+		return result;
 	} catch (err: any) {
 		SystemLogger.error({ msg: 'Error sending message:', err });