refactor: add new queue for post spam check

Author: winverse

packages/velog-server/src/lib/redis/RedisInterface.ts

@@ -47,6 +47,11 @@ export class RedisService extends Redis implements Service {
     const queueName = this.queueName.createFeed
     return await this.lpush(queueName, JSON.stringify(data))
   }
+
+  public async addToSpamCheckQueue(data: SpamCheckArgs): Promise<number> {
+    const queueName = this.queueName.spamCheck
+    return await this.lpush(queueName, JSON.stringify(data))
+  }
 }
 
 type GenerateRedisKey = {
@@ -60,7 +65,18 @@ type GenerateRedisKey = {
 
 type QueueName = 'createFeed' | 'spamCheck'
 
-type CreateFeedArgs = {
+export type ChangeEmailArgs = {
+  email: string
+  userId: string
+}
+
+export type CreateFeedArgs = {
   fk_following_id: string
   fk_post_id: string
 }
+
+export type SpamCheckArgs = {
+  post_id: string
+  user_id: string
+  ip: string
+}

packages/velog-server/src/lib/redis/RedisService.ts

@@ -18,7 +18,7 @@ import { SeriesService } from '@services/SeriesService/index.js'
 import { SearchService } from '@services/SearchService/index.js'
 import { ExternalIntegrationService } from '@services/ExternalIntegrationService/index.js'
 import { PostService } from '@services/PostService/index.js'
-import { RedisService } from '@lib/redis/RedisService.js'
+import { CreateFeedArgs, RedisService, SpamCheckArgs } from '@lib/redis/RedisService.js'
 import { GraphcdnService } from '@lib/graphcdn/GraphcdnService.js'
 import { ImageService } from '@services/ImageService/index.js'
 import { UserService } from '@services/UserService/index.js'
@@ -121,15 +121,15 @@ export class PostApiService implements Service {
     }
 
     if (!post.is_private && data.is_private) {
-      setImmediate(async () => {
+      setTimeout(async () => {
         if (!signedUserId) return
         const isIntegrated = await this.externalInterationService.checkIntegrated(signedUserId)
         if (!isIntegrated) return
         this.externalInterationService.notifyWebhook({
           type: 'deleted',
           post_id: post.id,
         })
-      })
+      }, 0)
     }
 
     return { ...post, url_slug: data.url_slug }
@@ -168,12 +168,10 @@ export class PostApiService implements Service {
     const isPublish = !data.is_temp && !data.is_private
 
     const country = geoip.lookup(ip)?.country ?? ''
-    const isSpam = this.isIncludeSpamKeyword({ input, user, country })
     const isLimit = await this.isPostLimitReached(signedUserId)
     const isBlock = await this.dynamicConfigService.isBlockedUser(user.username)
 
     const checks = [
-      { type: 'spam', value: isSpam },
       { type: 'limit', value: isLimit },
       { type: 'block', value: isBlock },
     ]
@@ -249,7 +247,7 @@ export class PostApiService implements Service {
     await this.handleTags(tags, post.id)
 
     if (isPublish) {
-      setImmediate(async () => {
+      setTimeout(async () => {
         if (!post) return
         if (!signedUserId) return
 
@@ -269,20 +267,34 @@ export class PostApiService implements Service {
             user: true,
           },
         })
+
         if (!targetPost) return
 
         const serializedPost = this.postService.serialize(targetPost)
         this.externalInterationService.notifyWebhook({
           type: type === 'write' ? 'created' : 'updated',
           post: serializedPost,
         })
-      })
-
-      const queueData = {
-        fk_following_id: signedUserId,
-        fk_post_id: post.id,
-      }
-      this.redis.createFeedQueue(queueData)
+      }, 0)
+
+      // create feed
+      setTimeout(() => {
+        const queueData: CreateFeedArgs = {
+          fk_following_id: signedUserId,
+          fk_post_id: post.id,
+        }
+        this.redis.createFeedQueue(queueData)
+      }, 0)
+
+      // check spam
+      setTimeout(() => {
+        const queueData: SpamCheckArgs = {
+          post_id: post.id,
+          user_id: signedUserId,
+          ip,
+        }
+        this.redis.addToSpamCheckQueue(queueData)
+      }, 0)
     }
 
     setTimeout(async () => {
@@ -322,16 +334,17 @@ export class PostApiService implements Service {
 
     const generate = customAlphabet('abcdefghijklmnopqrstuvwxyz1234567890', 8)
     const isEditArgs = this.isEditArgs(input)
+    const isWriteArgs = !isEditArgs
 
     if (isEditArgs && urlSlugDuplicate && urlSlugDuplicate.id !== input.id) {
       const randomString = generate(8)
-      processedUrlSlug = processedUrlSlug.slice(0, 245)
+      processedUrlSlug = processedUrlSlug.slice(0, 240)
       processedUrlSlug += `-${randomString}`
     }
 
-    if (!isEditArgs && urlSlugDuplicate) {
+    if (isWriteArgs && urlSlugDuplicate) {
       const randomString = generate(8)
-      processedUrlSlug = processedUrlSlug.slice(0, 245)
+      processedUrlSlug = processedUrlSlug.slice(0, 240)
       processedUrlSlug += `-${randomString}`
     }
 

packages/velog-server/src/services/PostApiService/index.ts

@@ -23,7 +23,7 @@ import { RedisService } from '@lib/redis/RedisService.js'
 import { changeEmailTemplate } from '@template/changeEmailTemplate.js'
 import { ENV } from '@env'
 import { MailService } from '@lib/mail/MailService.js'
-import { ChangeEmailDataType } from '@lib/redis/RedisInterface.js'
+import { ChangeEmailArgs } from '@lib/redis/RedisService.js'
 import { differenceInDays } from 'date-fns'
 
 interface Service {
@@ -246,7 +246,7 @@ export class UserService implements Service {
     const data = JSON.stringify({
       userId: user.id,
       email: email.toLowerCase(),
-    } as ChangeEmailDataType)
+    } as ChangeEmailArgs)
 
     const template = changeEmailTemplate(user.username, email, code)
 
@@ -279,7 +279,7 @@ export class UserService implements Service {
       throw new NotFoundError('Not found data')
     }
 
-    const { userId, email }: ChangeEmailDataType = JSON.parse(metadata)
+    const { userId, email }: ChangeEmailArgs = JSON.parse(metadata)
 
     if (userId !== signedUserId) {
       throw new UnauthorizedError('No permission to change the email')