Merge branch 'development'

Author: winverse

apps/cron/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20.12.0-alpine AS base
+FROM node:20.16.0-alpine AS base
 RUN apk update
 RUN apk add --no-cache libc6-compat
 
@@ -45,7 +45,7 @@ COPY --from=pruner /app/out/pnpm-workspace.yaml ./pnpm-workspace.yaml
 COPY --from=pruner /app/out/json/ ./
 COPY --from=pruner /app/out/full/ ./
 
-RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
+RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --prefer-frozen-lockfile
 
 RUN pnpm --filter @packages/database prisma:generate
 RUN pnpm --filter ${APP_NAME} ssm pull -e ${DOCKER_ENV}

apps/cron/src/services/PostReadService/index.mts

@@ -40,7 +40,8 @@ export class PostReadService implements Service {
     const postRead = await this.findById(postReadId)
 
     if (!postRead) {
-      throw new NotFoundError('Not found PostRead')
+      console.log(`Not found postReadId: ${postReadId}`)
+      return
     }
 
     await this.db.postRead.delete({

apps/cron/src/services/PostService/index.mts

@@ -179,11 +179,18 @@ export class PostService implements Service {
   ): Promise<{ isSpam: boolean; reason: string }> {
     const includesCN = /[\u4e00-\u9fa5]/.test(text)
     const includesKR = /[ㄱ-ㅎ|ㅏ-ㅣ|가-힣]/.test(text)
+    const includesVN = /[àáâãèéêìíòóôõùúýăđĩũơưạảấầẩẫậắằẳẵặẹẻẽếềểễệỉịọỏốồổỗộớờởỡợụủứừửữựỳỵỷỹ]/.test(
+      text,
+    )
 
     if (includesCN && !includesKR) {
       return { isSpam: true, reason: 'includesCN' }
     }
 
+    if (includesVN && !includesKR) {
+      return { isSpam: true, reason: 'includesVN' }
+    }
+
     let replaced = text.replace(/```([\s\S]*?)```/g, '') // remove code blocks
     // replace image markdown
     replaced = replaced.replace(/!\[([\s\S]*?)\]\(([\s\S]*?)\)/g, '')

apps/server/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20.12.0-alpine AS base
+FROM node:20.16.0-alpine AS base
 RUN apk update
 RUN apk add --no-cache libc6-compat
 

apps/server/src/services/PostService/index.ts

@@ -258,7 +258,7 @@ export class PostService implements Service {
       throw new BadRequestError('Invalid timeframe')
     }
 
-    if (timeframe === 'year' && offset > 1000) {
+    if (timeframe === 'year' && (offset > 1000 || limit > 20)) {
       console.log('Detected GraphQL Abuse', ip)
       return []
     }

apps/web/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20.12.0-alpine AS base
+FROM node:20.16.0-alpine AS base
 
 RUN corepack enable
 

package.json

@@ -35,9 +35,9 @@
     "@packages/tsconfig": "workspace:*",
     "@types/eslint": "^9.6.0",
     "@types/eslint__js": "^8.42.3",
-    "@types/node": "^20.16.1",
-    "@typescript-eslint/eslint-plugin": "^7.18.0",
-    "@typescript-eslint/parser": "^7.18.0",
+    "@types/node": "^20.14.0",
+    "@typescript-eslint/eslint-plugin": "^8.3.0",
+    "@typescript-eslint/parser": "^8.3.0",
     "eslint": "^9.9.0",
     "husky": "^9.1.4",
     "jiti": "^1.21.6",

packages/commonjs/package.json

@@ -20,8 +20,8 @@
   "dependencies": {
     "@graphql-tools/graphql-file-loader": "^8.0.1",
     "@graphql-tools/load": "^8.0.2",
-    "@graphql-tools/merge": "^9.0.4",
-    "axios": "^1.4.0"
+    "@graphql-tools/merge": "^9.0.6",
+    "axios": "^1.7.5"
   },
   "devDependencies": {
     "@types/node": "^20.14.0"

packages/eslint-config/package.json

@@ -23,4 +23,4 @@
     "jiti": "^1.21.6",
     "prettier": "^3.2.5"
   }
-}
+}