merge: upstream main (42 commits - preview comments, connected clients, platform fixes)

.env.example

@@ -489,8 +489,7 @@ REVENUECAT_WEBHOOK_SECRET="sample_revenuecat_webhook_secret"
 # Reject sandbox in-app purchases in production mode (true/false)
 IN_APP_PURCHASE_REJECT_SANDBOX="false"
 
-# ==============================================================================
-# 15. Telemetry, Observability & Analytics
+# =======================================================================# 15. Telemetry, Observability & Analytics
 # ==============================================================================
 # Sentry DSN for error reporting
 NEXT_PUBLIC_SENTRY_DSN="https://sample_sentry_key@o0.ingest.sentry.io/0000000"
@@ -516,3 +515,10 @@ NEXT_PUBLIC_FACEBOOK_PIXEL="123456789012345"
 FACEBOOK_PIXEL_ACCESS_TOKEN="sample_facebook_pixel_access_token"
 # Discord Support Server Widget URL
 NEXT_PUBLIC_DISCORD_SUPPORT="https://discord.gg/example"
+# reCAPTCHA Settings (invisible v2 on anonymous preview comments, optional; unset = no captcha)
+# RECAPTCHA_SITE_KEY="" # Your reCAPTCHA v2 invisible site key
+# RECAPTCHA_SECRET_KEY="" # Your reCAPTCHA v2 invisible secret key
+
+# Provider visibility / migration
+# HIDDEN_PROVIDERS="tiktok" # comma-separated identifiers hidden from the add-channel screen
+# MIGRATE_PROVIDERS="tiktok:tiktok-business" # comma-separated "old:new" pairs, a reconnect of "old" goes through "new" and the channel is migrated in place

.zcodeignore

@@ -0,0 +1,104 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+dist
+tmp
+/out-tsc
+.env
+.apple
+# dependencies
+node_modules
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+.vscode/*
+
+# IDE - VSCode
+.vscode/
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+yarn-error.log
+testem.log
+/typings
+
+# System Files
+.DS_Store
+Thumbs.db
+
+.nx/cache
+.nx/workspace-data
+
+# Next.js
+.next
+
+# Vim files
+**/*.swp
+**/*.swo
+
+# Temporary files
+*.orig
+*.~*~
+*.tsbuildinfo
+
+# ignore Secrets folder
+.secrets/
+libraries/plugins/src/plugins.ts
+i18n.cache
+
+# Generated by apps/frontend/scripts/fetch-gtm.mjs on install
+apps/frontend/public/g.js
+.vercel
+.env*
+*.env
+scripts/*.env
+.artifacts/
+.codex-artifacts/
+.playwright-mcp/
+.cloudflared/
+
+
+# ===== ↑ 以上同步自 .gitignore（「从 .gitignore 同步」只重写以上部分）=====
+.git/
+.hg/
+.svn/
+bower_components/
+jspm_packages/
+__pycache__/
+site-packages/
+venv/
+coverage/
+htmlcov/
+lcov-report/
+cmakefiles/
+cmake-build-*/
+bazel-*/
+pods/
+deriveddata/
+storybook-static/
+playwright-report/
+test-results/
+allure-results/
+allure-report/
+cdk.out/
+*.egg-info/
+*.dist-info/
+eggs/
+pip-wheel-metadata/
+wheels/
+# ----- ↑ 以上为 ZCode 默认排除规则（自定义规则请写在本行下方，不会被同步/恢复改动）-----
+# 自定义规则写在下方（本行提示可删除）

apps/backend/src/api/routes/posts.controller.ts

@@ -29,6 +29,11 @@ import {
   Sections,
 } from '@gitroom/backend/services/auth/permissions/permission.exception.class';
 import { PostValidationException } from '@gitroom/backend/api/routes/posts.validation.exception';
+import {
+  CreatePublicCommentDto,
+  ResolveCommentDto,
+} from '@gitroom/nestjs-libraries/dtos/comments/add.comment.dto';
+import { RealIP } from 'nestjs-real-ip';
 
 @ApiTags('Posts')
 @Controller('/posts')
@@ -71,12 +76,21 @@ export class PostsController {
 
   @Post('/:id/comments')
   async createComment(
-    @GetOrgFromRequest() org: Organization,
     @GetUserFromRequest() user: User,
     @Param('id') id: string,
-    @Body() body: { comment: string }
+    @Body() body: CreatePublicCommentDto,
+    @RealIP() ip: string
   ) {
-    return this._postsService.createComment(org.id, user.id, id, body.comment);
+    return this._postsService.createPublicComment(id, body, user.id, ip);
+  }
+
+  @Put('/comments/:commentId/resolve')
+  async resolveComment(
+    @GetOrgFromRequest() org: Organization,
+    @Param('commentId') commentId: string,
+    @Body() body: ResolveCommentDto
+  ) {
+    return this._postsService.resolveComment(org.id, commentId, body.resolved);
   }
 
   @Get('/tags')
@@ -159,7 +173,10 @@ export class PostsController {
   }
 
   @Get('/group/:group')
-  getPostsByGroup(@GetOrgFromRequest() org: Organization, @Param('group') group: string) {
+  getPostsByGroup(
+    @GetOrgFromRequest() org: Organization,
+    @Param('group') group: string
+  ) {
     return this._postsService.getPostsByGroup(org.id, group);
   }
 

apps/backend/src/api/routes/public.controller.ts

@@ -27,6 +27,7 @@ import { promisify } from 'util';
 import { OnlyURL } from '@gitroom/nestjs-libraries/dtos/webhooks/webhooks.dto';
 import { isSafePublicHttpsUrl } from '@gitroom/nestjs-libraries/dtos/webhooks/webhook.url.validator';
 import { ssrfSafeDispatcher } from '@gitroom/nestjs-libraries/dtos/webhooks/ssrf.safe.dispatcher';
+import { CreatePublicCommentDto } from '@gitroom/nestjs-libraries/dtos/comments/add.comment.dto';
 
 const pump = promisify(pipeline);
 
@@ -76,6 +77,15 @@ export class PublicController {
     return { comments: await this._postsService.getComments(postId) };
   }
 
+  @Post(`/posts/:id/comments`)
+  async createComment(
+    @Param('id') postId: string,
+    @Body() body: CreatePublicCommentDto,
+    @RealIP() ip: string
+  ) {
+    return this._postsService.createPublicComment(postId, body, null, ip);
+  }
+
   @Post('/t')
   async trackEvent(
     @Res() res: Response,
@@ -154,7 +164,6 @@ export class PublicController {
     }
   }
 
-
   @Get('/stream')
   async streamFile(
     @Query() query: OnlyURL,

apps/frontend/src/app/(app)/(preview)/p/[id]/layout.tsx

@@ -3,7 +3,7 @@ import { PreviewWrapper } from '@gitroom/frontend/components/preview/preview.wra
 
 export default async function AppLayout({ children }: { children: ReactNode }) {
   return (
-    <div className="bg-[#000000] min-h-screen">
+    <div className="bg-newBgColor min-h-screen text-newTextColor">
       <PreviewWrapper>{children}</PreviewWrapper>
     </div>
   );