Merge pull request #33 from velog-io/feature/post-api

Feature/post api

Author: winverse

packages/velog-cron/src/common/plugins/globals/cronPlugin.ts

@@ -34,6 +34,7 @@ const cronPlugin: FastifyPluginCallback = async (fastfiy, opts, done) => {
       name: 'generate feeds in every 1 minute',
       cronTime: '*/1 * * * *', // every 1 minute
       jobService: generateFeedJob,
+      isImmediateExecute: true,
     },
     {
       name: 'posts score calculation in every 5 minutes',

packages/velog-prisma/scripts/deploy.ts

@@ -57,8 +57,7 @@ function getMessage(migrationDiff: string[]): string {
   const question = `🤔 Are you sure?`
   return [
     title,
-    ...migrationDiff.map((filename) => `  - ${filename}\n\n${getMigrationSummary(filename)}`),
-    '',
+    ...migrationDiff.map((filename) => `  - ${filename}\n${getMigrationSummary(filename)}`),
     question,
   ].join('\n')
 }
@@ -72,10 +71,12 @@ function getMigrationSummary(filename: string) {
   )
 
   const sql = fs.readFileSync(filepath, { encoding: 'utf-8' })
+  const lines = sql.split('\n')
+
   const target = ['ALTER', 'CREATE', 'DROP']
-  return sql
-    .split('\n')
+  return lines
     .filter((line) => target.some((str) => line.includes(str)))
     .map((v) => `    - ${v.replace(/[{}\[\]()<>;]+/g, '').toLowerCase()}`)
+    .map((v, i, arr) => (i === arr.length - 1 ? `${v}\n` : v))
     .join('\n')
 }

packages/velog-scripts/env/.env.example

@@ -2,4 +2,5 @@ DATABASE_URL=
 DISCORD_BOT_TOKEN=
 DISCORD_PRIVATE_POSTS_CHANNEL_ID=
 REDIS_HOST=
-SPAM_ACCOUNT_DISPLAY_NAME=
+SPAM_ACCOUNT_DISPLAY_NAME=
+BANNED_KEYWORDS=

packages/velog-scripts/env/env.mts

@@ -15,7 +15,7 @@ const env = z.object({
   discordPrivatePostsChannelId: z.string(),
   redisHost: z.string(),
   restorePostsUsername: z.string().optional(),
-  bannedKeywords: z.array(z.string()).min(1),
+  bannedKeywords: z.array(z.string()),
 })
 
 export const ENV = env.parse({

packages/velog-scripts/lib/blockList/BlockListService.mts

@@ -0,0 +1,29 @@
+import { DbService } from '../db/DbService.mjs'
+import { injectable, singleton } from 'tsyringe'
+
+interface Service {
+  addBlockList: (username: string) => Promise<void>
+  readBlockList: () => Promise<string[]>
+}
+
+@injectable()
+@singleton()
+export class BlockListService implements Service {
+  constructor(private readonly db: DbService) {}
+  public async addBlockList(username: string) {
+    await this.db.dynamicConfigItem.create({
+      data: {
+        value: username,
+        type: 'username',
+      },
+    })
+  }
+  public async readBlockList() {
+    const blockList = await this.db.dynamicConfigItem.findMany({
+      where: {
+        type: 'username',
+      },
+    })
+    return blockList.map((item) => item.value)
+  }
+}

packages/velog-scripts/scripts/privatePostsOfSpamAccount.mts

@@ -5,17 +5,16 @@ import { container, injectable } from 'tsyringe'
 import inquirer from 'inquirer'
 import { ENV } from '../env/env.mjs'
 import { DiscordService } from '../lib/discord/DiscordService.mjs'
-import { RedisService } from '../lib/redis/RedisService.mjs'
+import { BlockListService } from '../lib/blockList/BlockListService.mjs'
 
 interface IRunner {}
 
 @injectable()
 class Runner implements IRunner {
-  blockList!: string[]
   constructor(
     private readonly db: DbService,
     private readonly discord: DiscordService,
-    private readonly redis: RedisService,
+    private readonly blockList: BlockListService,
   ) {}
   public async run(names: string[]) {
     await this.init()
@@ -26,8 +25,12 @@ class Runner implements IRunner {
         const user = await this.findUsersByUsername(username)
         const posts = await this.findWritenPostsByUserId(user.id)
 
-        // add block list
-        await this.redis.addBlockList(username)
+        const blockList = await this.blockList.readBlockList()
+
+        if (blockList.includes(username)) {
+          console.log(`${username} 유저는 이미 등록되어 있습니다.`)
+          continue
+        }
 
         if (posts.length === 0) {
           console.log(`${user.username} 유저의 비공개 처리 할 게시글이 없습니다.`)
@@ -41,9 +44,12 @@ class Runner implements IRunner {
           user.profile?.display_name || null,
         )
 
+        if (!askResult.is_set_private) continue
+
         const postIds = posts.map(({ id }) => id!)
+        // add block list
+        await this.blockList.addBlockList(username)
 
-        if (!askResult.is_set_private) continue
         // set private = true
         await this.setIsPrivatePost(postIds)
 
@@ -62,21 +68,24 @@ class Runner implements IRunner {
     }
 
     if (handledUser.length === 0) {
-      console.log('비공개 게시글 처리된 유저가 존재하지 않습니다.')
+      console.log('비공개 게시글로 처리된 유저가 존재하지 않습니다.')
       process.exit(0)
     }
 
     try {
-      const result = await this.discord.sendMessage(
-        ENV.discordPrivatePostsChannelId,
-        JSON.stringify({
-          title: '해당 유저의 글들이 비공개 처리 되었습니다.',
-          userInfo: handledUser,
-        }),
-      )
-
-      handledUser.map((u) => console.log(`${u.username} 유저가 처리 되었습니다.`))
-      console.log(result)
+      const promises = handledUser.map(async (userInfo) => {
+        await this.discord.sendMessage(
+          ENV.discordPrivatePostsChannelId,
+          JSON.stringify({
+            title: '해당 유저의 글들이 비공개 처리 되었습니다.',
+            userInfo: userInfo,
+          }),
+        )
+
+        console.log(`${userInfo.username} 유저가 처리 되었습니다.`)
+      })
+
+      await Promise.all(promises)
       process.exit(0)
     } catch (error) {
       console.log(error)
@@ -85,9 +94,7 @@ class Runner implements IRunner {
   private async init() {
     try {
       await this.discord.connection()
-      await this.redis.connection()
-
-      this.blockList = await this.redis.readBlockList()
+      await this.db.$connect()
     } catch (error) {
       throw error
     }
@@ -130,7 +137,8 @@ class Runner implements IRunner {
     username: string,
     displayName: string | null,
   ): Promise<AskDeletePostsResult> {
-    if (this.blockList.includes(username)) {
+    const blockedList = await this.blockList.readBlockList()
+    if (blockedList.includes(username)) {
       return {
         posts,
         is_set_private: true,

packages/velog-server/package.json

@@ -15,7 +15,7 @@
   "main": "main.ts",
   "type": "module",
   "scripts": {
-    "dev": "nodemon --watch './**/*.ts' --exec 'node --loader ts-paths-esm-loader' src/main.ts | pino-pretty",
+    "dev": "nodemon --watch './**/*.ts' --exec 'node --loader ts-paths-esm-loader/transpile-only' src/main.ts | pino-pretty",
     "stage": "pnpm ssm pull -e stage && NODE_ENV=production pnpm start",
     "prod": "pnpm ssm pull -e production && NODE_ENV=production pnpm start",
     "build": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json",
@@ -55,6 +55,7 @@
     "fastify": "^4.18.0",
     "fastify-multer": "^2.0.3",
     "fastify-plugin": "^4.5.1",
+    "geoip-country": "^4.2.68",
     "googleapis": "^124.0.0",
     "graphql": "^16.7.1",
     "graphql-scalars": "^1.22.2",
@@ -79,6 +80,7 @@
     "tsx": "^4.6.2",
     "tsyringe": "^4.7.0",
     "uuid": "^9.0.1",
+    "velog-server": "link:",
     "zod": "^3.21.4"
   },
   "devDependencies": {
@@ -89,6 +91,7 @@
     "@graphql-codegen/typescript-operations": "^4.0.0",
     "@graphql-codegen/typescript-resolvers": "^4.0.0",
     "@types/backblaze-b2": "^1.5.2",
+    "@types/geoip-country": "^4.0.2",
     "@types/inquirer": "^9.0.7",
     "@types/jest": "^29.5.2",
     "@types/jsonwebtoken": "^9.0.2",
@@ -106,6 +109,7 @@
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-prettier": "^5.0.0",
     "jest": "^29.6.4",
+    "jest-mock-axios": "^4.7.3",
     "jest-mock-extended": "^3.0.5",
     "json-schema-to-ts": "^2.9.2",
     "nodemon": "^2.0.22",

packages/velog-server/scripts/ssm/index.ts

@@ -91,7 +91,9 @@ class ParameterService {
       const command = new PutParameterCommand(input)
       const response = await this.client.send(command)
       console.info(`Parameter upload successful! path: ${name}, version: ${response.Version}`)
-    } catch (_) {}
+    } catch (error) {
+      console.error(error)
+    }
   }
 }
 

packages/velog-server/src/common/plugins/encapsulated/authGuardPlugin.ts

@@ -5,7 +5,7 @@ import fp from 'fastify-plugin'
 const authGuardPlugin: FastifyPluginAsync = async (fastify) => {
   fastify.addHook('preHandler', async (request) => {
     if (!request.user) {
-      throw new UnauthorizedError('Not Logged In')
+      throw new UnauthorizedError('Not logged in')
     }
   })
 }

packages/velog-server/src/common/plugins/global/ipaddrPlugin.ts

@@ -5,7 +5,8 @@ const ipaddrPlugin: FastifyPluginAsync = async (fastify) => {
   fastify.addHook('preHandler', (request, reply, done) => {
     const fromCdnIp = request.headers['gcdn-client-ip']
     const graphCdnAddress = Array.isArray(fromCdnIp) ? fromCdnIp[0] : fromCdnIp
-    request.ipaddr = graphCdnAddress || request.ips?.slice(-1)[0] || request.ip
+    const ipaddr = graphCdnAddress || request.ips?.slice(-1)[0] || request.ip
+    request.ipaddr = ipaddr
     done()
   })
 }

packages/velog-server/src/common/plugins/global/mercuriusPlugin.ts

@@ -32,6 +32,7 @@ const mercuriusPlugin: FastifyPluginAsync = async (fastify) => {
         errors: errors?.map((error) => ({ name: error.name, message: error.message })),
       }
       if (ENV.appEnv === 'development') {
+        console.log('errorHandler')
         request.log.error(request, 'errorHandler')
       } else {
         const discord = container.resolve(DiscordService)
@@ -50,6 +51,7 @@ const mercuriusPlugin: FastifyPluginAsync = async (fastify) => {
       const e = execution.errors?.[0]?.originalError
 
       if (!isHttpError(e)) {
+        console.log('send!')
         ;(ctx as any).request?.log?.error(execution, 'errorFormatter')
         const discord = container.resolve(DiscordService)
         discord.sendMessage(

packages/velog-server/src/env.ts

@@ -3,6 +3,8 @@ import { existsSync } from 'fs'
 import { z } from 'zod'
 import { fileURLToPath } from 'url'
 import { dirname, join } from 'path'
+import { container } from 'tsyringe'
+import { DbService } from '@lib/db/DbService.js'
 
 type DockerEnv = 'development' | 'stage' | 'production'
 type AppEnvironment = 'development' | 'production'
@@ -14,9 +16,9 @@ const envFiles: EnvFiles = {
   stage: '.env.stage',
 }
 
-if (!process.env.DOCKER_ENV && process.env.NODE_ENV !== 'development') {
+if (!process.env.DOCKER_ENV && process.env.NODE_ENV !== undefined) {
   console.error(
-    'Development environment was initiated despite the absence of the Docker environment.',
+    'Development environment was initiated, despite the absence of the Docker environment.',
   )
 }
 
@@ -72,6 +74,7 @@ const env = z.object({
   codenaryApiKey: z.string(),
   codenaryCallback: z.string(),
   redisHost: z.string(),
+  redisPort: z.number(),
   slackUrl: z.string(),
   slackImage: z.string(),
   blacklistUsername: z.array(z.string()),
@@ -80,8 +83,15 @@ const env = z.object({
   adFreeWritersUsername: z.array(z.string()),
   discordBotToken: z.string(),
   discordErrorChannel: z.string(),
+  discordSpamChannel: z.string(),
+  turnstileSecretKey: z.string(),
+  bannedKeywords: z.array(z.string()),
+  bannedAltKeywords: z.array(z.string()),
+  graphcdnToken: z.string(),
 })
 
+const { bannedKeywords, bannedAltKeywords } = await readEnvFromDatabase()
+
 export const ENV = env.parse({
   dockerEnv,
   appEnv,
@@ -110,6 +120,7 @@ export const ENV = env.parse({
   codenaryApiKey: process.env.CODENARY_API_KEY,
   codenaryCallback: process.env.CODENARY_CALLBACK,
   redisHost: process.env.REDIS_HOST,
+  redisPort: Number(process.env.REDIS_PORT) || 6379,
   slackUrl: `https://hooks.slack.com/services/${process.env.SLACK_TOKEN}`,
   slackImage: process.env.SLACK_IMAGE,
   blacklistUsername: (process.env.BLACKLIST_USERNAME ?? '').split(','),
@@ -118,4 +129,19 @@ export const ENV = env.parse({
   adFreeWritersUsername: process.env.AD_FREE_WRITERS_USERNAME?.split(','),
   discordBotToken: process.env.DISCORD_BOT_TOKEN,
   discordErrorChannel: process.env.DISCORD_ERROR_CHANNEL,
+  discordSpamChannel: process.env.DISCORD_SPAM_CHANNEL,
+  turnstileSecretKey: process.env.TURNSTILE_SECRET_KEY,
+  bannedKeywords: bannedKeywords,
+  bannedAltKeywords: bannedAltKeywords,
+  graphcdnToken: process.env.GRAPHCDN_TOKEN,
 })
+
+async function readEnvFromDatabase() {
+  const db = container.resolve(DbService)
+  const items = await db.dynamicConfigItem.findMany()
+
+  return {
+    bannedKeywords: items.filter((item) => item.type === 'banned').map((item) => item.value),
+    bannedAltKeywords: items.filter((item) => item.type === 'bannedAlt').map((item) => item.value),
+  }
+}