Merge remote-tracking branch 'origin/development'

Author: winverse

infrastructure/src/common/ecs.ts

@@ -40,6 +40,7 @@ export const createECSfargateService = ({
         subnets: subnetIds,
       },
       taskDefinitionArgs: {
+        // TODO: Ignore changes for taskDefinitionArgs.cpu, memory
         // cpu: option.taskCpu,
         // memory: option.taskMemory,
         executionRole: {
@@ -88,7 +89,7 @@ export const createECSfargateService = ({
       scalableDimension: 'ecs:service:DesiredCount',
       serviceNamespace: 'ecs',
     },
-    { replaceOnChanges: ['resourceId'] },
+    // { replaceOnChanges: ['resourceId'] },
   )
 
   const ecsCPUPolicy = new aws.appautoscaling.Policy(
@@ -107,7 +108,7 @@ export const createECSfargateService = ({
         scaleOutCooldown: 60,
       },
     },
-    { replaceOnChanges: ['resourceId'] },
+    // { replaceOnChanges: ['resourceId'] },
   )
 
   const ecsMemoryPolicy = new aws.appautoscaling.Policy(
@@ -126,6 +127,6 @@ export const createECSfargateService = ({
         scaleOutCooldown: 60,
       },
     },
-    { replaceOnChanges: ['resourceId'] },
+    // { replaceOnChanges: ['resourceId'] },
   )
 }

infrastructure/src/lib/ecsOptions.ts

@@ -29,7 +29,7 @@ const serverProdEcsOption: EcsBaseOption = {
   cpu: 1, // unit 1024
   memory: 2, // unit 1024
   maxCapacity: 12,
-  minCapacity: 2,
+  minCapacity: 1,
 }
 
 const serverStageEcsOption: EcsBaseOption = {

packages/velog-cron/src/lib/discord/DiscordService.ts

@@ -56,10 +56,10 @@ export class DiscordService {
       const channel = await this.client.channels.fetch(channelId)
 
       if (channel?.isTextBased()) {
-        if (message.length > 2000) {
-          console.log('message', message)
+        const chunkSize = 2000
+        for (let i = 0; i < message.length; i += chunkSize) {
+          await channel.send(message.slice(i, i + chunkSize))
         }
-        await channel.send(message.slice(0, 2000))
       } else {
         throw new Error('Wrong channel type')
       }

packages/velog-cron/src/services/PostService/index.ts

@@ -146,7 +146,7 @@ export class PostService implements Service {
     country: string,
   ): Promise<{ isSpam: boolean; reason: string; targetType?: string }> {
     const allowList = ['KR', 'GB', '']
-    const blockList = ['IN', 'PK', 'CN', 'VN', 'TH', 'PH']
+    const blockList = ['IN', 'PK', 'CN', 'VN', 'TH', 'PH', 'UG']
     const isForeign = !allowList.includes(country)
 
     if (blockList.includes(country)) {
@@ -201,7 +201,7 @@ export class PostService implements Service {
 
     const containsPhoneNumber = phoneRegex.some((regex) => regex.test(replaced))
 
-    if (containsPhoneNumber) {
+    if (containsPhoneNumber && isForeign) {
       return { isSpam: true, reason: 'containsPhoneNumber' }
     }
 

packages/velog-cron/src/services/StatsService/index.ts

@@ -43,17 +43,19 @@ export class StatsService implements Service {
     )
   }
   public async weekly() {
-    const start = startOfWeek(subWeeks(new Date(), 1), { weekStartsOn: 1 }) // 월요일부터 시작
-    const end = endOfWeek(subWeeks(new Date(), 1))
+    const oneWeekAgo = subWeeks(new Date(), 1)
+    const start = startOfWeek(oneWeekAgo, { weekStartsOn: 1 }) // 월요일부터 시작
+    const end = endOfWeek(oneWeekAgo, { weekStartsOn: 1 })
 
     const usersCount = await this.getUsersCount(start, end)
     const postCount = await this.getPostsCount(start, end)
 
+    const timeFormat = 'yyyy-MM-dd HH:mm:ss'
     await this.discord.sendMessage(
       'stats',
-      `[Weekly]\n기간: ${format(
-        start,
-        'yyyy-MM-dd',
+      `[Daily]\n기간: ${format(start, timeFormat)}-${format(
+        end,
+        'HH:mm:ss',
       )}\n${usersCount}명의 사용자가 가입했습니다.\n${postCount}개의 공개 포스트가 작성되었습니다.`,
     )
   }

packages/velog-scripts/lib/discord/DiscordService.mts

@@ -33,7 +33,10 @@ export class DiscordService {
         const channel = await this.client.channels.fetch(channelId)
 
         if (channel?.isTextBased()) {
-          await channel.send(message)
+          const chunkSize = 2000
+          for (let i = 0; i < message.length; i += chunkSize) {
+            await channel.send(message.slice(i, i + chunkSize))
+          }
         } else {
           throw new Error('Wrong channel type')
         }

packages/velog-server/src/lib/discord/DiscordService.ts

@@ -60,10 +60,10 @@ export class DiscordService {
       const channel = await this.client.channels.fetch(channelId)
 
       if (channel?.isTextBased()) {
-        if (message.length > 2000) {
-          console.log('message', message)
+        const chunkSize = 2000
+        for (let i = 0; i < message.length; i += chunkSize) {
+          await channel.send(message.slice(i, i + chunkSize))
         }
-        await channel.send(message.slice(0, 2000))
       } else {
         throw new Error('Wrong channel type')
       }