fix(tweet): view counter + delete + counters + type + clean service

* fix(tweet): handle mentions corner cases

* fix(tweet): handle mentions corner cases

* fix(tweet): arabic hashtags

* fix(tweet): do not notify mentioned user if the original tweet is his

* fix(tweet): mention in update tweet

* fix(tweet): some fixes

* fix(tweet): decrement counters

* fix(tweets): view sync

* fix(tweets): reply and get replies new versions (the old commented)

* fix(tweets): clean unes blocks

* fix(tweets): hard delete with clean up cron jobs + clean repy, replies + extend the response to include post_type (the actual one)

* fix(test): unit tests

* fix(test): unit tests

* feat(tweet): views counter

* fix(test): unit tests

* fix(mig): to make sure all works fine

---------

Co-authored-by: Mohamed Bahgat <mbahgat503@gmail.com>
Co-authored-by: shady-2004 <shadyshiko2004@gmail.com>

Author: 3 people

simple-socket-test.html

@@ -489,6 +489,7 @@ <h2>Event Logs</h2>
         const message = {
           content: content,
           message_type: messageType,
+          image_url: "https://yapperdev.blob.core.windows.net/profile-images/test-team-1765575149782-standard.jpg",
         };
 
         if (messageType === "reply" && replyToId) {

src/auth/auth.service.ts

@@ -137,11 +137,11 @@ export class AuthService {
         const { name, birth_date, email, captcha_token } = dto;
 
         // Verify CAPTCHA first
-        // try {
-        //     await this.captcha_service.validateCaptcha(captcha_token);
-        // } catch (error) {
-        //     throw new BadRequestException(ERROR_MESSAGES.CAPTCHA_VERIFICATION_FAILED);
-        // }
+        try {
+            await this.captcha_service.validateCaptcha(captcha_token);
+        } catch (error) {
+            throw new BadRequestException(ERROR_MESSAGES.CAPTCHA_VERIFICATION_FAILED);
+        }
 
         const existing_user = await this.user_repository.findByEmail(email);
         if (existing_user) {

src/background-jobs/ai-summary/ai-summary.service.ts

@@ -3,7 +3,7 @@ import { BackgroundJobsService } from '../background-jobs';
 import { QUEUE_NAMES } from '../constants/queue.constants';
 import { Injectable, Logger } from '@nestjs/common';
 import type { Queue } from 'bull';
-import { JOB_NAMES, JOB_PRIORITIES, JOB_DELAYS } from '../constants/queue.constants';
+import { JOB_DELAYS, JOB_NAMES, JOB_PRIORITIES } from '../constants/queue.constants';
 import { GenerateTweetSummaryDto } from './ai-summary.dto';
 
 @Injectable()
@@ -25,13 +25,13 @@ export class AiSummaryJobService extends BackgroundJobsService<GenerateTweetSumm
         return `tweet-summary:${dto.tweet_id}`;
     }
 
-    // Override queueJob to customize cleanup for fixed jobId
+    // Override queueJob to customize cleanup for fixed job_id
     async queueGenerateSummary(dto: GenerateTweetSummaryDto) {
         try {
-            const jobId = this.getJobId(dto);
+            const job_id = this.getJobId(dto);
 
             const job = await this.queue.add(this.job_name, dto, {
-                jobId,
+                jobId: job_id,
                 priority: JOB_PRIORITIES.MEDIUM,
                 delay: JOB_DELAYS.IMMEDIATE,
                 attempts: 3,

src/background-jobs/notifications/mention/mention.dto.ts

@@ -8,7 +8,7 @@ export class MentionBackGroundNotificationJobDTO {
     parent_tweet?: TweetResponseDTO;
 
     mentioned_by: string;
-    mentioned_usernames?: string[];
+    mentioned_user_ids?: string[];
 
     tweet_type: 'tweet' | 'quote' | 'reply';
 

src/background-jobs/notifications/mention/mention.processor.spec.ts

@@ -86,11 +86,6 @@ describe('MentionProcessor', () => {
                 user_id: 'user-author',
             };
 
-            const mock_users = [
-                { id: 'user-1', username: 'user1' },
-                { id: 'user-2', username: 'user2' },
-            ];
-
             const mock_mentioner = {
                 id: 'user-author',
                 username: 'author',
@@ -99,11 +94,10 @@ describe('MentionProcessor', () => {
                 avatar_url: 'avatar.jpg',
             };
 
-            user_repository.find.mockResolvedValue(mock_users as User[]);
             user_repository.findOne.mockResolvedValue(mock_mentioner as User);
 
             const job = mock_job({
-                mentioned_usernames: ['user1', 'user2'],
+                mentioned_user_ids: ['user-1', 'user-2'],
                 mentioned_by: 'user-author',
                 tweet_id: 'tweet-123',
                 tweet: mock_tweet as unknown as Tweet,
@@ -113,10 +107,6 @@ describe('MentionProcessor', () => {
 
             await processor.handleSendMentionNotification(job);
 
-            expect(user_repository.find).toHaveBeenCalledWith({
-                where: [{ username: 'user1' }, { username: 'user2' }],
-                select: ['id'],
-            });
             expect(user_repository.findOne).toHaveBeenCalledTimes(2);
             expect(notifications_service.saveNotificationAndSend).toHaveBeenCalledTimes(2);
         });
@@ -128,12 +118,8 @@ describe('MentionProcessor', () => {
                 user_id: 'user-author',
             };
 
-            const mock_users = [{ id: 'user-author', username: 'author' }];
-
-            user_repository.find.mockResolvedValue(mock_users as User[]);
-
             const job = mock_job({
-                mentioned_usernames: ['author'],
+                mentioned_user_ids: ['user-author'],
                 mentioned_by: 'user-author',
                 tweet_id: 'tweet-123',
                 tweet: mock_tweet as unknown as Tweet,
@@ -158,29 +144,26 @@ describe('MentionProcessor', () => {
                 text: 'Original tweet',
             };
 
-            const mock_users = [{ id: 'user-1', username: 'user1' }];
-
             const mock_mentioner = {
                 id: 'user-author',
-                username: 'author',
-                email: 'author@test.com',
-                name: 'Author',
-                avatar_url: 'avatar.jpg',
+                username: 'author-user',
+                email: 'author@example.com',
+                name: 'Author User',
+                avatar_url: 'http://example.com/avatar.jpg',
             };
 
-            user_repository.find.mockResolvedValue(mock_users as User[]);
-            user_repository.findOne.mockResolvedValue(mock_mentioner as User);
-
             const job = mock_job({
-                mentioned_usernames: ['user1'],
+                mentioned_user_ids: ['user-1'],
                 mentioned_by: 'user-author',
-                tweet_id: 'quote-123',
                 tweet: mock_tweet as unknown as Tweet,
                 parent_tweet: mock_parent_tweet as any,
                 tweet_type: 'quote',
                 action: 'add',
             });
 
+            user_repository.findOne.mockResolvedValue(mock_mentioner as any);
+            notifications_service.saveNotificationAndSend.mockResolvedValue(undefined);
+
             await processor.handleSendMentionNotification(job);
 
             expect(notifications_service.saveNotificationAndSend).toHaveBeenCalledWith(
@@ -192,10 +175,7 @@ describe('MentionProcessor', () => {
                     mentioned_by: 'user-author',
                     tweet_type: 'quote',
                 }),
-                expect.objectContaining({
-                    type: NotificationType.MENTION,
-                    tweet_type: 'quote',
-                })
+                expect.anything()
             );
         });
 
@@ -211,8 +191,6 @@ describe('MentionProcessor', () => {
                 text: 'Original tweet',
             };
 
-            const mock_users = [{ id: 'user-1', username: 'user1' }];
-
             const mock_mentioner = {
                 id: 'user-author',
                 username: 'author',
@@ -221,11 +199,10 @@ describe('MentionProcessor', () => {
                 avatar_url: 'avatar.jpg',
             };
 
-            user_repository.find.mockResolvedValue(mock_users as User[]);
             user_repository.findOne.mockResolvedValue(mock_mentioner as User);
 
             const job = mock_job({
-                mentioned_usernames: ['user1'],
+                mentioned_user_ids: ['user-1'],
                 mentioned_by: 'user-author',
                 tweet_id: 'reply-123',
                 tweet: mock_tweet as unknown as Tweet,
@@ -253,7 +230,7 @@ describe('MentionProcessor', () => {
             const logger_spy = jest.spyOn(processor['logger'], 'warn');
 
             const job = mock_job({
-                mentioned_usernames: ['user1'],
+                mentioned_user_ids: ['user-1'],
                 mentioned_by: 'user-author',
                 tweet_id: 'tweet-123',
                 tweet_type: 'tweet',
@@ -275,15 +252,12 @@ describe('MentionProcessor', () => {
                 user_id: 'user-author',
             };
 
-            const mock_users = [{ id: 'user-1', username: 'user1' }];
-
             const logger_spy = jest.spyOn(processor['logger'], 'warn');
 
-            user_repository.find.mockResolvedValue(mock_users as User[]);
             user_repository.findOne.mockResolvedValue(null);
 
             const job = mock_job({
-                mentioned_usernames: ['user1'],
+                mentioned_user_ids: ['user-1'],
                 mentioned_by: 'user-author',
                 tweet_id: 'tweet-123',
                 tweet: mock_tweet as unknown as Tweet,
@@ -300,18 +274,12 @@ describe('MentionProcessor', () => {
 
     describe('handleSendMentionNotification - remove action', () => {
         it('should remove mention notifications for multiple users', async () => {
-            const mock_users = [
-                { id: 'user-1', username: 'user1' },
-                { id: 'user-2', username: 'user2' },
-            ];
-
-            user_repository.find.mockResolvedValue(mock_users as User[]);
             notifications_service.removeMentionNotification.mockResolvedValue(
                 'notification-id-123'
             );
 
             const job = mock_job({
-                mentioned_usernames: ['user1', 'user2'],
+                mentioned_user_ids: ['user-1', 'user-2'],
                 mentioned_by: 'user-author',
                 tweet_id: 'tweet-123',
                 action: 'remove',
@@ -338,13 +306,10 @@ describe('MentionProcessor', () => {
         });
 
         it('should skip sending notification if removal failed', async () => {
-            const mock_users = [{ id: 'user-1', username: 'user1' }];
-
-            user_repository.find.mockResolvedValue(mock_users as User[]);
             notifications_service.removeMentionNotification.mockResolvedValue(null);
 
             const job = mock_job({
-                mentioned_usernames: ['user1'],
+                mentioned_user_ids: ['user-1'],
                 mentioned_by: 'user-author',
                 tweet_id: 'tweet-123',
                 action: 'remove',
@@ -357,18 +322,12 @@ describe('MentionProcessor', () => {
         });
 
         it('should not remove mention for the author themselves', async () => {
-            const mock_users = [
-                { id: 'user-author', username: 'author' },
-                { id: 'user-1', username: 'user1' },
-            ];
-
-            user_repository.find.mockResolvedValue(mock_users as User[]);
             notifications_service.removeMentionNotification.mockResolvedValue(
                 'notification-id-123'
             );
 
             const job = mock_job({
-                mentioned_usernames: ['author', 'user1'],
+                mentioned_user_ids: ['user-author', 'user-1'],
                 mentioned_by: 'user-author',
                 tweet_id: 'tweet-123',
                 action: 'remove',
@@ -386,7 +345,7 @@ describe('MentionProcessor', () => {
 
         it('should handle empty mentioned_usernames array', async () => {
             const job = mock_job({
-                mentioned_usernames: [],
+                mentioned_user_ids: [],
                 mentioned_by: 'user-author',
                 tweet_id: 'tweet-123',
                 action: 'remove',
@@ -400,14 +359,13 @@ describe('MentionProcessor', () => {
 
         it('should handle missing tweet_id', async () => {
             const job = mock_job({
-                mentioned_usernames: ['user1'],
+                mentioned_user_ids: ['user-1'],
                 mentioned_by: 'user-author',
                 action: 'remove',
             });
 
             await processor.handleSendMentionNotification(job);
 
-            expect(user_repository.find).not.toHaveBeenCalled();
             expect(notifications_service.removeMentionNotification).not.toHaveBeenCalled();
         });
     });
@@ -422,10 +380,11 @@ describe('MentionProcessor', () => {
 
             const logger_spy = jest.spyOn(processor['logger'], 'error');
             const error = new Error('Database connection failed');
-            user_repository.find.mockRejectedValue(error);
+
+            user_repository.findOne.mockRejectedValue(error);
 
             const job = mock_job({
-                mentioned_usernames: ['user1'],
+                mentioned_user_ids: ['user-1'],
                 mentioned_by: 'user-author',
                 tweet_id: 'tweet-123',
                 tweet: mock_tweet as unknown as Tweet,
@@ -447,8 +406,6 @@ describe('MentionProcessor', () => {
                 user_id: 'user-author',
             };
 
-            const mock_users = [{ id: 'user-1', username: 'user1' }];
-
             const mock_mentioner = {
                 id: 'user-author',
                 username: 'author',
@@ -457,14 +414,13 @@ describe('MentionProcessor', () => {
                 avatar_url: 'avatar.jpg',
             };
 
-            user_repository.find.mockResolvedValue(mock_users as User[]);
             user_repository.findOne.mockResolvedValue(mock_mentioner as User);
 
             const error = new Error('Save failed');
             notifications_service.saveNotificationAndSend.mockRejectedValue(error);
 
             const job = mock_job({
-                mentioned_usernames: ['user1'],
+                mentioned_user_ids: ['user-1'],
                 mentioned_by: 'user-author',
                 tweet_id: 'tweet-123',
                 tweet: mock_tweet as unknown as Tweet,

src/background-jobs/notifications/mention/mention.processor.ts

@@ -31,7 +31,7 @@ export class MentionProcessor {
     async handleSendMentionNotification(job: Job<MentionBackGroundNotificationJobDTO>) {
         try {
             const {
-                mentioned_usernames,
+                mentioned_user_ids,
                 mentioned_by,
                 tweet_id,
                 tweet,
@@ -42,29 +42,23 @@ export class MentionProcessor {
 
             if (action === 'remove') {
                 // For remove action, we need usernames to find user IDs
-                if (!mentioned_usernames || mentioned_usernames.length === 0 || !tweet_id) return;
-
-                // Fetch user IDs from usernames
-                const users = await this.user_repository.find({
-                    where: mentioned_usernames.map((username) => ({ username })),
-                    select: ['id'],
-                });
+                if (!mentioned_user_ids || mentioned_user_ids.length === 0 || !tweet_id) return;
 
                 // Queue removal for each mentioned user
-                for (const user of users) {
-                    if (user.id === mentioned_by) continue;
+                for (const user_id of mentioned_user_ids) {
+                    if (user_id === mentioned_by) continue;
 
                     const notification_id =
                         await this.notifications_service.removeMentionNotification(
-                            user.id,
+                            user_id,
                             tweet_id,
                             mentioned_by
                         );
 
                     if (notification_id) {
                         this.notifications_service.sendNotificationOnly(
                             NotificationType.MENTION,
-                            user.id,
+                            user_id,
                             {
                                 id: notification_id,
                                 ...job.data,
@@ -80,19 +74,13 @@ export class MentionProcessor {
                 }
 
                 // For add action with usernames (batch processing)
-                else if (mentioned_usernames && mentioned_usernames.length > 0) {
-                    // Fetch user IDs from usernames
-                    const users = await this.user_repository.find({
-                        where: mentioned_usernames.map((username) => ({ username })),
-                        select: ['id'],
-                    });
-
+                else if (mentioned_user_ids && mentioned_user_ids.length > 0) {
                     // Process mention for each user
-                    for (const user of users) {
-                        if (user.id === mentioned_by) continue;
+                    for (const user_id of mentioned_user_ids) {
+                        if (user_id === mentioned_by) continue;
 
                         await this.processMentionForUser(
-                            user.id,
+                            user_id,
                             mentioned_by,
                             tweet,
                             parent_tweet,