[core] Fix smoke test

[core] 2025.10.3
[core] NOWEB - use upstream libsignal
2025-10-16 17:07:47 +07:00 · 2025-10-16 16:57:01 +07:00 · 2025-10-16 16:57:01 +07:00 · 2025-10-16 16:56:36 +07:00 · 2025-10-16 16:56:35 +07:00 · 2025-10-16 16:56:35 +07:00
90 changed files with 4565 additions and 435 deletions
@@ -3,9 +3,25 @@
 # https://waha.devlike.pro/docs/how-to/config/
 #

+# ====================
+# ===== SECURITY =====
+# ====================
+WAHA_API_KEY=00000000000000000000000000000000
+WAHA_DASHBOARD_USERNAME=admin
+WAHA_DASHBOARD_PASSWORD=11111111111111111111111111111111
+WHATSAPP_SWAGGER_USERNAME=admin
+WHATSAPP_SWAGGER_PASSWORD=11111111111111111111111111111111
+
+# Disable Dashboard or Swagger
+WAHA_DASHBOARD_ENABLED=True
+WHATSAPP_SWAGGER_ENABLED=True
+
 # ==================
 # ===== COMMON =====
 # ==================
+# WhatsApp engine (WEBJS is default, GOWS or NOWEB for better performance)
+WHATSAPP_DEFAULT_ENGINE=WEBJS
+
 # Base URL for the API (used for webhooks, file URLs, etc.)
 WAHA_BASE_URL=http://localhost:3000
 # WAHA_PUBLIC_URL=http://localhost:3000
@@ -15,20 +31,7 @@ WAHA_BASE_URL=http://localhost:3000
 # WHATSAPP_API_PORT=3000
 # WHATSAPP_API_HOSTNAME=localhost

-# ====================
-# ===== SECURITY =====
-# ====================
-# "sha512:{SHA}" format - below is "admin" api key
-WAHA_API_KEY=sha512:c7ad44cbad762a5da0a452f9e854fdc1e0e7a52a38015f23f3eab1d80b931dd472634dfac71cd34ebc35d16ab7fb8a90c81f975113d6c7538dc69dd8de9077ec
-WAHA_DASHBOARD_ENABLED=True
-WAHA_DASHBOARD_USERNAME=admin
-WAHA_DASHBOARD_PASSWORD=admin
-WHATSAPP_SWAGGER_ENABLED=True
-WHATSAPP_SWAGGER_USERNAME=admin
-WHATSAPP_SWAGGER_PASSWORD=admin

-# WhatsApp engine (WEBJS is default, GOWS or NOWEB for better performance)
-WHATSAPP_DEFAULT_ENGINE=WEBJS

 # ===================
 # ===== LOGGING =====
@@ -129,6 +129,7 @@ jobs:
          docker run -d \
            --name smoke \
            --rm -p3000:3000 \
+            -e WAHA_API_KEY=test \
            ${{ vars.DOCKER_IMAGE }}:${{ matrix.tag }}

          sleep 3
@@ -0,0 +1,51 @@
+name: 'github-translate'
+on:
+  issues:
+    types: [opened]
+  issue_comment:
+    types: [created]
+  discussion:
+    types: [created]
+  discussion_comment:
+    types: [created]
+  # pull_request_target:
+  #   types: [opened, edited]
+  # pull_request_review_comment:
+  #   types: [created, edited]
+
+jobs:
+  en:
+    permissions:
+      issues: write
+      discussions: write
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: devlikeapro/github-translate-action@main
+        env:
+          # GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          IS_MODIFY_TITLE: true
+          CUSTOM_BOT_NOTE: 'English'
+          TARGET_LANGUAGE: 'eng'
+          TRANSLATED_LANGUAGE: 'en'
+
+  pt:
+    permissions:
+      issues: write
+      discussions: write
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: devlikeapro/github-translate-action@main
+        env:
+          # GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          IS_MODIFY_TITLE: false
+          CUSTOM_BOT_NOTE: 'Portuguese'
+          TARGET_LANGUAGE: 'por'
+          TRANSLATED_LANGUAGE: 'pt'
@@ -67,9 +67,11 @@ repos:
        exclude: |
          (?x)^(
              entrypoint.sh|
+              AGENTS.md|
              .pre-commit-config.yaml|
              ^src/core/engines/webjs/session.webjs.core.ts|
              ^src/core/engines/webjs/_lodash.js|
              ^tests/perf/.*|
              ^scripts/.*|
+              ^scripts/init-waha.js|
          )$
@@ -0,0 +1,124 @@
+# WAHA Agent Playbook
+
+This guide summarizes how to explore, modify, and validate the WhatsApp HTTP API
+(WAHA) codebase when assisting as an automation or coding agent.
+
+## Product & Variants
+
+- WAHA ships in **Core** and **Plus** editions. Core lives under `src/core` and
+  only supports the default session plus minimal media features. Plus extends
+  core via `src/plus` to add multi-session orchestration, richer media handling,
+  and external storage integrations.
+- Core code must remain free from Plus-only references. A pre-commit hook
+  rejects the word `plus` inside core files; reuse abstractions exposed through
+  `@waha/core/**` instead of importing Plus modules from Core.
+- Commit subjects are validated: changes that touch `src/plus` require a
+  `[PLUS] …` prefix and must not include non-Plus files; everything else must
+  use `[core] …`. Verify against `./.precommit/validate_commit_message.py` if
+  unsure.
+
+## Tech Stack Snapshot
+
+- **Runtime**: Node.js 22.x, Yarn 3.6 (Berry). Always install packages and run
+  scripts with Yarn.
+- **Framework**: NestJS v11 with dependency injection, modular controllers in
+  `src/api`, and Pino-based logging via `nestjs-pino`.
+- **Engines**: WhatsApp engines are abstracted (`WEBJS`, `GOWS`, `NOWEB`). Core
+  uses `SessionManagerCore`; Plus swaps to `SessionManagerPlus` with extra
+  storage backends (Mongo/Postgres/SQLite).
+- **ESM Bridge**: ESM-only dependencies (Baileys) load through
+  `src/vendor/esm.ts`. Add new ESM modules there to ensure they load exactly
+  once.
+- **Utilities**: RxJS streams (`SwitchObservable`, `DefaultMap`) drive webhook
+  event fan-out. Prefer existing helpers in `src/utils` and `src/core/utils`
+  before adding bespoke logic.
+
+## Repository Landmarks
+
+- `src/main.ts`: runtime entry point; dynamically loads the correct AppModule
+  (Core vs Plus) and configures global interceptors/filters.
+- `src/api/**`: REST controllers and WebSocket gateway. Keep handlers thin;
+  delegate to managers/services. HTTP routes follow `/api/{sessionName}/…`;
+  always thread the session name through request DTOs and guards instead of
+  hardcoding `default`.
+- `src/core/**`: shared abstractions (config services, engine bootstrap,
+  storage, session management). Core only allows the `default` session and
+  cleans up storage on boot.
+- `src/plus/**`: multi-session orchestration, advanced media services, and
+  external persistence layers (Mongo, Postgres). Reuse this layer when adding
+  Plus-only capabilities.
+- `src/apps/**`: integrations (e.g., ChatWoot) and application-specific
+  services.
+- `src/structures/**` and `src/utils/**`: DTOs, enums (event names follow
+  `domain.action`), helper utilities. Maintain naming consistency when
+  introducing new events.
+- `tests/**`: Jest-based suites; do not add new tests unless explicitly asked,
+  but keep existing tests working.
+
+## Coding Expectations
+
+- Favor composable, long-lived solutions. If a helper already exists (e.g.,
+  `parseBool`, `DefaultMap`, media factories), extend it instead of reinventing
+  logic. Lodash ships with the project—prefer its utilities over hand-rolled
+  helpers. Import lodash as a namespace (`import * as lodash from 'lodash';`) so
+  helpers like `lodash.camelCase` stay consistent across files. When a new
+  third-party library seems necessary, confirm with the user, especially if the
+  package looks stale.
+- Stick to NestJS patterns: inject dependencies through constructors, expose
+  provider tokens from modules, and keep controllers free from business logic.
+- Logging goes through injected `PinoLogger` or helpers in
+  `src/utils/logging.ts`. `console.log` is blocked by pre-commit.
+- Respect path aliases (`@waha/...`) defined in `tsconfig.json`; keep imports
+  consistent (use absolute aliases, not relative `../../../`).
+- Avoid naming unused variables with a leading underscore; if a parameter is
+  required by a signature, explicitly `void` it instead.
+- For configs, prefer runtime configurability over constants. Environment keys
+  follow `WAHA_*` for global values and `WAHA_SESSION_CONFIG_*` /
+  `session.config.*` for per-session overrides. If both env and config are
+  supported, honor both (`WAHA_WEBJS_CONFIG_*` vs. `session.webjs.config.*`).
+
+## Language & Localization
+
+- Keep identifiers (classes, methods, variables) and code comments in English so
+  the codebase stays consistent for the global team.
+- Route user-visible strings through the existing i18n structure rather than
+  hardcoding text. ChatWoot copy belongs in `src/apps/chatwoot/i18n` with
+  English as the source locale before adding translations.
+
+## ChatWoot Integration Notes
+
+- Avoid introducing synthetic events; map onto existing webhook or engine events
+  whenever plausible. Always use the official ChatWoot API client located in
+  `src/apps/chatwoot/client`.
+- When adding events, align consumer names with webhook/event identifiers (e.g.,
+  `message.any`).
+
+## Workflow Checklist
+
+1. Identify whether work targets Core, Plus, or shared layers. If Plus-only,
+   isolate changes to `src/plus` and ensure the commit prefix matches.
+2. Lean on existing services/managers; extend the appropriate session manager
+   rather than branching logic inline.
+3. After edits run:
+   - `pre-commit run --all-files`
+   - `yarn build`
+   - `yarn test` Use Node 22. Address lint or formatting issues before
+     proceeding.
+4. Do **not** start the application yourself; ask the user to run it if runtime
+   validation is required.
+5. Capture any assumptions or open questions for the user, especially when
+   touching configs, introducing dependencies, or modifying public APIs.
+
+## Additional Tips
+
+- Concurrency-sensitive sections (session start/stop) rely on `async-lock`. When
+  adding async flows, reuse `SessionManager.withLock` or existing retry
+  utilities (`promiseTimeout`, `waitUntil`).
+- Media features centralize through `MediaManager` and `MediaStorageFactory`.
+  When altering media behavior, update both Core and Plus variants where
+  applicable.
+- Keep docs and code ASCII unless a file already uses other characters. When
+  updating documentation, mirror the concise, actionable tone used here.
+
+Following this playbook keeps contributions aligned with WAHA’s structure,
+automation hooks, and release process.
@@ -195,6 +195,11 @@ COPY --from=build /git/node_modules ./node_modules
 COPY --from=build /git/dist ./dist
 COPY --from=dashboard /dashboard ./dist/dashboard
 COPY --from=gows /go/gows/bin/gows /app/gows
+COPY .env.example ./.env.example
+COPY scripts/init-waha.js ./scripts/init-waha.js
+RUN chmod +x ./scripts/init-waha.js \
+  && printf '%s\n' '#!/bin/sh' 'exec node /app/scripts/init-waha.js "$@"' > /usr/local/bin/init-waha \
+  && chmod +x /usr/local/bin/init-waha
 ENV WAHA_GOWS_PATH=/app/gows
 ENV WAHA_GOWS_SOCKET=/tmp/gows.sock

@@ -35,7 +35,7 @@ for-swagger:
 	WHATSAPP_SWAGGER_CONFIG_ADVANCED=true . ${NVM_DIR}/nvm.sh && nvm exec yarn start

 up-noweb:
-	yarn up @adiwajshing/baileys@github:devlikeapro/Baileys#fork-master-2025-10-03
+	yarn up @adiwajshing/baileys@github:devlikeapro/Baileys#fork-master-2025-10-10

 up-noweb-libsignal:
 	yarn up libsignal@github:devlikeapro/libsignal-node#fork-master
@@ -3,6 +3,20 @@
 # https://waha.devlike.pro/docs/how-to/config/
 #

+# ====================
+# ===== SECURITY =====
+# ====================
+WAHA_API_KEY_PLAIN=00000000000000000000000000000000
+WAHA_API_KEY=00000000000000000000000000000000
+WAHA_DASHBOARD_USERNAME=admin
+WAHA_DASHBOARD_PASSWORD=11111111111111111111111111111111
+WHATSAPP_SWAGGER_USERNAME=admin
+WHATSAPP_SWAGGER_PASSWORD=11111111111111111111111111111111
+
+# Disable Dashboard or Swagger
+WAHA_DASHBOARD_ENABLED=True
+WHATSAPP_SWAGGER_ENABLED=True
+
 # ==================
 # ===== COMMON =====
 # ==================
@@ -15,20 +29,6 @@ WAHA_PUBLIC_URL=http://localhost:3000
 # WHATSAPP_API_PORT=3000
 # WHATSAPP_API_HOSTNAME=localhost

-# ====================
-# ===== SECURITY =====
-# ====================
-# WAHA Apps requires both sha and plain version
-WAHA_API_KEY_PLAIN=00000000000000000000000000000000
-WAHA_API_KEY=sha512:98b6d128682e280b74b324ca82a6bae6e8a3f7174e0605bfd52eb9948fad8984854ec08f7652f32055c4a9f12b69add4850481d9503a7f2225501671d6124648
-WAHA_DASHBOARD_USERNAME=admin
-WAHA_DASHBOARD_PASSWORD=11111111111111111111111111111111
-WHATSAPP_SWAGGER_USERNAME=admin
-WHATSAPP_SWAGGER_PASSWORD=11111111111111111111111111111111
-
-WAHA_DASHBOARD_ENABLED=True
-WHATSAPP_SWAGGER_ENABLED=True
-
 # WhatsApp engine (WEBJS is default, GOWS or NOWEB for better performance)
 WHATSAPP_DEFAULT_ENGINE=GOWS

@@ -24,7 +24,7 @@ services:
      - 8.8.8.8

  base: &base
-    image: chatwoot/chatwoot:v4.5.2
+    image: chatwoot/chatwoot:v4.6.0
    env_file: .chatwoot.env ## Change this file for customized env variables
    volumes:
      - chatwoot_storage:/app/storage
@@ -41,11 +41,6 @@ if [ -n "$key" ]; then
    # If already hashed, use it as is
    export WAHA_API_KEY="$key"
  else
-    # Display warning about using plain text API key
-    echo "⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️"
-    echo "WARNING: Plain text API key detected. Converting to hashed format for security."
-    echo "For better security, use WAHA_API_KEY=sha512:{SHA512_HASH_FOR_YOUR_API_KEY}"
-    echo "⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️"
    # Hash the key using sha512sum
    HASHED_KEY=$(echo -n "$key" | sha512sum | awk '{print $1}')
    export WAHA_API_KEY="sha512:$HASHED_KEY"
@@ -26,7 +26,7 @@
    "gows:proto": "yarn gows:proto:fetch && yarn gows:proto:build"
  },
  "dependencies": {
-    "@adiwajshing/baileys": "github:devlikeapro/Baileys#fork-master-2025-10-03",
+    "@adiwajshing/baileys": "github:devlikeapro/Baileys#fork-master-2025-10-10",
    "@adiwajshing/keyed-db": "^0.2.4",
    "@aws-sdk/client-s3": "^3.633.0",
    "@aws-sdk/s3-request-presigner": "^3.633.0",
@@ -76,9 +76,10 @@
    "joi": "^17.13.3",
    "knex": "^3.1.0",
    "libphonenumber-js": "^1.10.36",
-    "libsignal": "github:devlikeapro/libsignal-node#fork-master",
+    "libsignal": "github:WhiskeySockets/libsignal-node#master",
    "link-preview-js": "^3.0.4",
    "lodash": "^4.17.21",
+    "long": "^5.3.2",
    "mime-types": "^2.1.27",
    "mongodb": "6.9.0",
    "mustache": "^4.2.0",
@@ -101,6 +102,7 @@
    "sqlite3": "^5.1.7",
    "swagger-ui-express": "^4.1.4",
    "ulid": "^2.3.0",
+    "undici": "^7.16.0",
    "whatsapp-web.js": "github:devlikeapro/whatsapp-web.js#fork-main-2025-09-10",
    "write-file-atomic": "^6.0.0",
    "yaml": "^2.7.1"
@@ -113,7 +115,6 @@
    "ws": "^8.18.0",
    "puppeteer": "^24.19.0",
    "whatwg-url": "13.0.0",
-    "libsignal": "github:devlikeapro/libsignal-node#fork-master",
    "axios": "^1.9.0"
  },
  "devDependencies": {
@@ -148,6 +149,9 @@
      "ts"
    ],
    "rootDir": "src",
+    "moduleNameMapper": {
+      "^@waha/(.*)$": "<rootDir>/$1"
+    },
    "testRegex": ".test.ts$",
    "transform": {
      "^.+\\.(t|j)s$": "ts-jest"
@@ -0,0 +1,92 @@
+#!/usr/bin/env node
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const crypto = require('crypto');
+
+const projectRoot = path.resolve(__dirname, '..');
+
+const args = process.argv.slice(2);
+const forceIndex = args.indexOf('--force');
+const forceOverwrite = forceIndex !== -1;
+
+if (forceOverwrite) {
+  args.splice(forceIndex, 1);
+}
+
+const folderArg = args[0] || '.';
+const sourceArgRaw = args[1];
+const targetArg = args[2] || '.env';
+
+const envDir = path.resolve(process.cwd(), folderArg);
+const sourceArg = sourceArgRaw || '.env.example';
+const templateBaseDir = sourceArgRaw ? envDir : projectRoot;
+const templatePath = path.isAbsolute(sourceArg)
+  ? sourceArg
+  : path.resolve(templateBaseDir, sourceArg);
+const targetPath = path.isAbsolute(targetArg)
+  ? targetArg
+  : path.resolve(envDir, targetArg);
+
+function exitWithMessage(message, code = 1) {
+  console.error(message);
+  process.exit(code);
+}
+
+if (!fs.existsSync(envDir)) {
+  exitWithMessage(`Target directory does not exist: ${envDir}`);
+}
+
+if (!fs.existsSync(templatePath)) {
+  exitWithMessage(`Missing template file: ${templatePath}`);
+}
+
+if (!forceOverwrite && fs.existsSync(targetPath)) {
+  const stats = fs.statSync(targetPath);
+  if (stats.size > 0) {
+    exitWithMessage(
+      `${targetPath} already exists and is not empty. Remove it manually or rerun with --force to overwrite.`,
+    );
+  }
+}
+
+const exampleContent = fs.readFileSync(templatePath, 'utf8');
+
+function generateSecret() {
+  return crypto.randomUUID({ disableEntropyCache: true }).replace(/-/g, '');
+}
+
+const apiKey = generateSecret();
+const adminPassword = generateSecret();
+
+const updatedContent = exampleContent
+  .replace(/^WAHA_API_KEY=.*/m, `WAHA_API_KEY=${apiKey}`)
+  .replace(/^WAHA_API_KEY_PLAIN=.*/m, `WAHA_API_KEY_PLAIN=${apiKey}`)
+  .replace(/^WAHA_DASHBOARD_USERNAME=.*/m, 'WAHA_DASHBOARD_USERNAME=admin')
+  .replace(
+    /^WAHA_DASHBOARD_PASSWORD=.*/m,
+    `WAHA_DASHBOARD_PASSWORD=${adminPassword}`,
+  )
+  .replace(/^WHATSAPP_SWAGGER_USERNAME=.*/m, 'WHATSAPP_SWAGGER_USERNAME=admin')
+  .replace(
+    /^WHATSAPP_SWAGGER_PASSWORD=.*/m,
+    `WHATSAPP_SWAGGER_PASSWORD=${adminPassword}`,
+  );
+
+fs.writeFileSync(targetPath, updatedContent, { encoding: 'utf8' });
+
+const lines = [
+  'Credentials generated.',
+  '',
+  'Dashboard and Swagger:',
+  '  - Username: admin',
+  `  - Password: ${adminPassword}`,
+  '',
+  'API key: ',
+  `  - ${apiKey}`,
+  '',
+  'Use it in the Dashboard connection flow: https://waha.devlike.pro/docs/how-to/dashboard/#api-key',
+];
+
+console.log(lines.join('\n'));
@@ -2,10 +2,11 @@ import * as process from 'node:process';

 import { parseBool } from '@waha/helpers';
 import * as basicAuth from 'express-basic-auth';
+import { Auth } from '@waha/core/auth/config';

 export function BullAuthMiddleware() {
-  let username = process.env.WAHA_DASHBOARD_USERNAME || '';
-  let password = process.env.WAHA_DASHBOARD_PASSWORD || '';
+  let username = Auth.dashboard.username.value || '';
+  let password = Auth.dashboard.password.value || '';
  if (process.env.WAHA_DASHBOARD_ENABLED) {
    const enabled = parseBool(process.env.WAHA_DASHBOARD_ENABLED);
    if (!enabled) {
@@ -0,0 +1,12 @@
+import { ILogger } from '@waha/apps/app_sdk/ILogger';
+
+export function JestLogger(): ILogger {
+  return {
+    fatal: jest.fn(),
+    error: jest.fn(),
+    warn: jest.fn(),
+    info: jest.fn(),
+    debug: jest.fn(),
+    trace: jest.fn(),
+  };
+}
@@ -13,6 +13,7 @@ import { ChatwootLocalesController } from '@waha/apps/chatwoot/api/chatwoot.loca
 import { ChatWootExports } from '@waha/apps/chatwoot/chatwoot.module';
 import { parseBool } from '@waha/helpers';
 import { RMutexModule } from '@waha/modules/rmutex';
+import { Auth } from '@waha/core/auth/config';

 const IMPORTS = [
  BullModule.forRoot({
@@ -93,11 +94,11 @@ const AppsDisabled = {
 };

 function checkApiKey() {
-  const key = process.env.WHATSAPP_API_KEY || process.env.WAHA_API_KEY;
+  const key = Auth.key.value;
  if (!key) {
    return;
  }
-  const plain = process.env.WAHA_API_KEY_PLAIN;
+  const plain = Auth.keyplain.value;
  if (!plain) {
    throw Error(
      'WAHA_API_KEY set, please provide WAHA_API_KEY_PLAIN when WAHA_APPS_ENABLED',
@@ -81,6 +81,19 @@ export class ChatwootWebhookController {
        }
        return { success: true };
      case EventName.MESSAGE_UPDATED:
+        // We handle only "retries" on message_update
+        // This is the attribute ChatWoot send
+        // There's NO other way to identify "status: read" updates right now
+        // There's no "body.status" in message_updated webhook :(
+        const isRetryNull = body.content_attributes?.external_error === null;
+        const isRetrySomething = Boolean(
+          body.content_attributes?.external_error,
+        );
+        const isRetry = isRetryNull || isRetrySomething;
+        if (!isRetry) {
+          return { success: true };
+        }
+
        if (!isCommandsChat) {
          await this.chatWootQueueService.addMessageUpdatedJob(data);
        } else {
@@ -1,7 +1,8 @@
 import { ChatWootAPIConfig } from '@waha/apps/chatwoot/client/interfaces';
 import * as NodeCache from 'node-cache';

-import { ConversationId, IConversationCache } from './IConversationCache';
+import { IConversationCache } from './IConversationCache';
+import { ContactIds } from '@waha/apps/chatwoot/client/ConversationService';

 const cache: NodeCache = new NodeCache({
  stdTTL: 24 * 60 * 60, // 1 day
@@ -24,7 +25,7 @@ class ConversationCache implements IConversationCache {
    cache.del(fullKey);
  }

-  get(key: string): ConversationId | null {
+  get(key: string): ContactIds | null {
    const fullKey = this.fullKey(key);
    return cache.get(fullKey) || null;
  }
@@ -34,7 +35,7 @@ class ConversationCache implements IConversationCache {
    return cache.has(fullKey);
  }

-  set(key: string, value: ConversationId): void {
+  set(key: string, value: ContactIds): void {
    const fullKey = this.fullKey(key);
    cache.set(fullKey, value);
  }
@@ -1,8 +1,8 @@
-export type ConversationId = number;
+import { ContactIds } from '@waha/apps/chatwoot/client/ConversationService';

 export interface IConversationCache {
-  get(key: string): ConversationId | null;
-  set(key: string, value: ConversationId): void;
+  get(key: string): ContactIds | null;
+  set(key: string, value: ContactIds): void;
  has(key: string): boolean;
  delete(key: string): void;
  clean(): void;
@@ -21,6 +21,7 @@ import { WAHAMessageAnyConsumer } from './consumers/waha/message.any';
 import { WAHAMessageEditedConsumer } from './consumers/waha/message.edited';
 import { WAHAMessageReactionConsumer } from './consumers/waha/message.reaction';
 import { WAHAMessageRevokedConsumer } from './consumers/waha/message.revoked';
+import { WAHAMessageAckConsumer } from './consumers/waha/message.ack';
 import { WAHASessionStatusConsumer } from './consumers/waha/session.status';
 import { ChatWootQueueService } from './services/ChatWootQueueService';
 import { ChatWootScheduleService } from './services/ChatWootScheduleService';
@@ -55,6 +56,10 @@ const IMPORTS = lodash.flatten([
    name: QueueName.WAHA_MESSAGE_REVOKED,
    defaultJobOptions: merge(ExponentialRetriesJobOptions, JobRemoveOptions),
  }),
+  RegisterAppQueue({
+    name: QueueName.WAHA_MESSAGE_ACK,
+    defaultJobOptions: merge(ExponentialRetriesJobOptions, JobRemoveOptions),
+  }),
  RegisterAppQueue({
    name: QueueName.WAHA_SESSION_STATUS,
    defaultJobOptions: merge(ExponentialRetriesJobOptions, JobRemoveOptions),
@@ -98,6 +103,7 @@ const PROVIDERS = [
  WAHAMessageReactionConsumer,
  WAHAMessageEditedConsumer,
  WAHAMessageRevokedConsumer,
+  WAHAMessageAckConsumer,
  MessageCleanupConsumer,
  CheckVersionConsumer,
  ChatWootWAHAQueueService,
@@ -0,0 +1,26 @@
+import axios from 'axios';
+
+export class ChatWootInboxNewAPI {
+  constructor(
+    private base: string,
+    private inboxIdentifier: string,
+  ) {}
+
+  async updateLastSeen(sourceId: string, conversationId: number) {
+    // TODO: Move to the lib (fork?)
+    // Call the update_last_seen endpoint using a direct HTTP request
+    // since the SDK doesn't have this method
+    const path = `/public/api/v1/inboxes/${this.inboxIdentifier}/contacts/${sourceId}/conversations/${conversationId}/update_last_seen`;
+    const url = new URL(path, this.base).toString();
+    await axios.post(
+      url,
+      {},
+      {
+        headers: {
+          api_access_token: this.inboxIdentifier,
+          'Content-Type': 'application/json',
+        },
+      },
+    );
+  }
+}
@@ -5,16 +5,16 @@ import ChatwootClient, {
 import { ILogger } from '@waha/apps/app_sdk/ILogger';
 import { ContactService } from '@waha/apps/chatwoot/client/ContactService';
 import { Conversation } from '@waha/apps/chatwoot/client/Conversation';
-import { ConversationService } from '@waha/apps/chatwoot/client/ConversationService';
+import {
+  ContactIds,
+  ConversationService,
+} from '@waha/apps/chatwoot/client/ConversationService';
 import { ChatWootAPIConfig } from '@waha/apps/chatwoot/client/interfaces';
 import { InboxContactInfo } from '@waha/apps/chatwoot/contacts/InboxContactInfo';
 import { Locale } from '@waha/apps/chatwoot/i18n/locale';

 import { CacheForConfig } from '../cache/ConversationCache';
-import {
-  ConversationId,
-  IConversationCache,
-} from '../cache/IConversationCache';
+import { IConversationCache } from '../cache/IConversationCache';

 export interface ContactInfo {
  ChatId(): string;
@@ -42,7 +42,7 @@ export class ContactConversationService {

  private async upsertByContactInfo(
    contactInfo: ContactInfo,
-  ): Promise<ConversationId> {
+  ): Promise<ContactIds> {
    const chatId = contactInfo.ChatId();

    // Check cache for chat id
@@ -96,19 +96,24 @@ export class ContactConversationService {
    );

    // Save to cache
-    this.cache.set(chatId, conversation.id);
-    return conversation.id;
+    const ids = {
+      id: conversation.id,
+      sourceId: contact.sourceId,
+    };
+    this.cache.set(chatId, ids);
+    return ids;
  }

  public async ConversationByContact(
    contactInfo: ContactInfo,
  ): Promise<Conversation> {
    const chatId = contactInfo.ChatId();
-    const conversationId = await this.upsertByContactInfo(contactInfo);
+    const ids = await this.upsertByContactInfo(contactInfo);
    const conversation = new Conversation(
      this.accountAPI,
      this.config.accountId,
-      conversationId,
+      ids.id,
+      ids.sourceId,
    );
    conversation.onError = (err) => {
      if (err instanceof ChatWootAPIError) {
@@ -116,7 +121,7 @@ export class ContactConversationService {
        this.cache.delete(chatId);
        this.logger.error(`ApiError: ${err.message}`);
        this.logger.error(
-          `ApiError occurred, invalidating cache for chat.id: ${chatId}, conversation.id: ${conversationId}`,
+          `ApiError occurred, invalidating cache for chat.id: ${chatId}, conversation.id: ${ids.id}, source.id: ${ids.sourceId}`,
        );
      }
    };
@@ -146,18 +151,25 @@ export class ContactConversationService {
    }
  }

-  public ResetMismatchedCache(chatIds: Array<string>, value: ConversationId) {
+  public ResetMismatchedCache(chatIds: Array<string>, contactId: number) {
    for (const chatId of chatIds) {
      if (!this.cache.has(chatId)) {
        continue;
      }
      const current = this.cache.get(chatId);
-      if (current !== value) {
+      if (current.id !== contactId) {
        this.logger.info(
-          `Resetting cache for chat id: ${chatId}, value changed from ${current} to ${value}`,
+          `Resetting cache for chat id: ${chatId}, value changed from ${current} to ${contactId}`,
        );
        this.cache.delete(chatId);
      }
    }
  }
+
+  public async markConversationAsRead(
+    conversationId: number,
+    sourceId: string,
+  ): Promise<void> {
+    await this.conversationService.markAsRead(conversationId, sourceId);
+  }
 }
@@ -9,6 +9,7 @@ export class Conversation {
    private accountAPI: ChatwootClient,
    private accountId: number,
    public conversationId: number,
+    public sourceId: string | null = null,
  ) {}

  public async send(data: conversation_message_create) {
@@ -6,6 +6,8 @@ import {
 } from '@waha/apps/chatwoot/client/interfaces';
 import type { conversation } from '@figuro/chatwoot-sdk/dist/models/conversation';
 import { ConversationSelector } from '@waha/apps/chatwoot/services/ConversationSelector';
+import axios from 'axios';
+import { ChatWootInboxNewAPI } from '@waha/apps/chatwoot/client/ChatWootInboxNewAPI';

 export type ConversationResult = Pick<conversation, 'id' | 'account_id'>;

@@ -54,4 +56,23 @@ export class ConversationService {
    );
    return conversation;
  }
+
+  async markAsRead(conversationId: number, sourceId: string): Promise<void> {
+    try {
+      const inboxNewAPI = new ChatWootInboxNewAPI(
+        this.config.url,
+        this.config.inboxIdentifier,
+      );
+      await inboxNewAPI.updateLastSeen(sourceId, conversationId);
+      this.logger.info(
+        `Marked conversation.id: ${conversationId} as read in inbox: ${this.config.inboxIdentifier} for contact: ${sourceId}`,
+      );
+    } catch (error) {
+      const reason = error instanceof Error ? error.message : String(error);
+      this.logger.error(
+        `Error marking conversation.id: ${conversationId} as read: ${reason}`,
+      );
+      throw error;
+    }
+  }
 }
@@ -13,6 +13,7 @@ export enum QueueName {
  WAHA_MESSAGE_REACTION = 'chatwoot.waha | message.reaction',
  WAHA_MESSAGE_EDITED = 'chatwoot.waha | message.edited',
  WAHA_MESSAGE_REVOKED = 'chatwoot.waha | message.revoked',
+  WAHA_MESSAGE_ACK = 'chatwoot.waha | message.ack',
  //
  // ChatWoot Events - Real
  //
@@ -15,7 +15,7 @@ import {
  MessageMapping,
  MessageMappingService,
 } from '@waha/apps/chatwoot/storage';
-import { MarkdownToWhatsApp } from '@waha/apps/chatwoot/text';
+import { MarkdownToWhatsApp } from '@waha/apps/chatwoot/messages/to/whatsapp/markdown';
 import { SessionManager } from '@waha/core/abc/manager.abc';
 import { RMutexService } from '@waha/modules/rmutex/rmutex.service';
 import {
@@ -42,6 +42,7 @@ export function ListenEventsForChatWoot() {
    WAHAEvents.MESSAGE_REACTION,
    WAHAEvents.MESSAGE_EDITED,
    WAHAEvents.MESSAGE_REVOKED,
+    WAHAEvents.MESSAGE_ACK,
    WAHAEvents.SESSION_STATUS,
  ];
 }
@@ -96,8 +97,15 @@ export abstract class ChatWootWAHABaseConsumer extends AppConsumer {
    messageInfo: IMessageInfo,
  ): Promise<any>;

+  ShouldProcess(event: any): boolean {
+    return true;
+  }
+
  async processJob(job: Job<EventData, any, WAHAEvents>): Promise<any> {
-    const event: WAHAWebhookMessageRevoked = job.data.event as any;
+    const event = job.data.event as any;
+    if (!this.ShouldProcess(event)) {
+      return;
+    }
    const key = WhatsAppChatIdKey(job.data.app, this.GetChatId(event));
    return await this.withMutex(job, key, () =>
      this.ProcessAndReportErrors(job),
@@ -0,0 +1,132 @@
+import { Processor } from '@nestjs/bullmq';
+import { ILogger } from '@waha/apps/app_sdk/ILogger';
+import { JOB_CONCURRENCY } from '@waha/apps/app_sdk/constants';
+import { ContactConversationService } from '@waha/apps/chatwoot/client/ContactConversationService';
+import { QueueName } from '@waha/apps/chatwoot/consumers/QueueName';
+import { EventData } from '@waha/apps/chatwoot/consumers/types';
+import {
+  ChatWootWAHABaseConsumer,
+  IMessageInfo,
+} from '@waha/apps/chatwoot/consumers/waha/base';
+import { WhatsAppContactInfo } from '@waha/apps/chatwoot/contacts/WhatsAppContactInfo';
+import { Locale } from '@waha/apps/chatwoot/i18n/locale';
+import { WAHASessionAPI } from '@waha/apps/chatwoot/session/WAHASelf';
+import { SessionManager } from '@waha/core/abc/manager.abc';
+import { RMutexService } from '@waha/modules/rmutex/rmutex.service';
+import { WAHAEvents, WAMessageAck } from '@waha/structures/enums.dto';
+import { WAHAWebhookMessageAck } from '@waha/structures/webhooks.dto';
+import { Job } from 'bullmq';
+import { PinoLogger } from 'nestjs-pino';
+import { isJidCusFormat } from '@waha/utils/wa';
+import { isLidUser } from '@adiwajshing/baileys/lib/WABinary/jid-utils';
+import { toCusFormat } from '@waha/core/utils/jids';
+
+@Processor(QueueName.WAHA_MESSAGE_ACK, { concurrency: JOB_CONCURRENCY })
+export class WAHAMessageAckConsumer extends ChatWootWAHABaseConsumer {
+  constructor(
+    protected readonly manager: SessionManager,
+    log: PinoLogger,
+    rmutex: RMutexService,
+  ) {
+    super(manager, log, rmutex, 'WAHAMessageAckConsumer');
+  }
+
+  ShouldProcess(event: WAHAWebhookMessageAck): boolean {
+    // Mark as seen only if it's DM
+    // Ignore groups and other multiple participants chats
+    const chatId = this.GetChatId(event);
+    if (!isJidCusFormat(chatId) && !isLidUser(chatId)) {
+      return false;
+    }
+
+    const payload = event.payload;
+    // Only READ and PLAYED
+    const read = payload.ack === WAMessageAck.READ;
+    const played = payload.ack == WAMessageAck.PLAYED;
+    if (!read && !played) {
+      return true;
+    }
+    // Only not from me
+    const sender = toCusFormat(payload._data?.Sender) || payload.from;
+    const me = this.manager.getSession(event.session).getSessionMeInfo();
+    if (sender == me.id || sender === me.lid) {
+      this.logger.debug('Ignore from me ack');
+      // Ignore from me
+      return false;
+    }
+    return true;
+  }
+
+  GetChatId(event: WAHAWebhookMessageAck): string {
+    return event.payload.from;
+  }
+
+  async Process(
+    job: Job<EventData, any, WAHAEvents>,
+    info: IMessageInfo,
+  ): Promise<void> {
+    const container = await this.DIContainer(job, job.data.app);
+    const event = job.data.event as WAHAWebhookMessageAck;
+    const session = new WAHASessionAPI(event.session, container.WAHASelf());
+    const handler = new MessageAckHandler(
+      container.ContactConversationService(),
+      container.Logger(),
+      info,
+      session,
+      container.Locale(),
+    );
+    try {
+      await handler.handle(event);
+    } catch (e) {
+      // TODO: Investigate errors
+      // https://github.com/devlikeapro/waha/issues/1492
+      this.logger.error(e);
+    }
+  }
+}
+
+class MessageAckHandler {
+  constructor(
+    private readonly contactConversationService: ContactConversationService,
+    private readonly logger: ILogger,
+    private readonly info: IMessageInfo,
+    private readonly session: WAHASessionAPI,
+    private readonly locale: Locale,
+  ) {}
+
+  async handle(event: WAHAWebhookMessageAck): Promise<void> {
+    const payload = event.payload;
+    const contactInfo = WhatsAppContactInfo(
+      this.session,
+      payload.from,
+      this.locale,
+    );
+    const conversation =
+      await this.contactConversationService.ConversationByContact(contactInfo);
+    this.info.onConversationId(conversation.conversationId);
+
+    const sourceId = conversation.sourceId;
+    if (!sourceId) {
+      this.logger.warn(
+        `Contact not found for chat.id: ${payload.from}. Skipping read update for message ${payload.id}`,
+      );
+      return;
+    }
+
+    try {
+      await this.contactConversationService.markConversationAsRead(
+        conversation.conversationId,
+        sourceId,
+      );
+      this.logger.info(
+        `Marked conversation ${conversation.conversationId} as read for chat.id: ${payload.from} (message: ${payload.id}, sourceId: ${sourceId})`,
+      );
+    } catch (error) {
+      const reason = error instanceof Error ? error.message : String(error);
+      this.logger.error(
+        `Error marking conversation ${conversation.conversationId} as read for chat.id: ${payload.from}. Reason: ${reason}`,
+      );
+      throw error;
+    }
+  }
+}
@@ -1,7 +1,5 @@
-import type { proto } from '@adiwajshing/baileys';
 import { Processor } from '@nestjs/bullmq';
 import { JOB_CONCURRENCY } from '@waha/apps/app_sdk/constants';
-import { SendAttachment } from '@waha/apps/chatwoot/client/types';
 import { QueueName } from '@waha/apps/chatwoot/consumers/QueueName';
 import { EventData } from '@waha/apps/chatwoot/consumers/types';
 import {
@@ -11,7 +9,6 @@ import {
  MessageBaseHandler,
 } from '@waha/apps/chatwoot/consumers/waha/base';
 import { WAHASessionAPI } from '@waha/apps/chatwoot/session/WAHASelf';
-import { WhatsappToMarkdown } from '@waha/apps/chatwoot/text';
 import { SessionManager } from '@waha/core/abc/manager.abc';
 import { parseMessageIdSerialized } from '@waha/core/utils/ids';
 import { RMutexService } from '@waha/modules/rmutex/rmutex.service';
@@ -20,13 +17,19 @@ import { WAMessage } from '@waha/structures/responses.dto';
 import { WAHAWebhookMessageAny } from '@waha/structures/webhooks.dto';
 import { Job } from 'bullmq';
 import { PinoLogger } from 'nestjs-pino';
-import { TKey } from '@waha/apps/chatwoot/i18n/templates';
-import { JobLink } from '@waha/apps/app_sdk/JobUtils';
-import * as lodash from 'lodash';
-import { parseVCardV3, SimpleVCardInfo } from '@waha/core/vcard';
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const mime = require('mime-types');
+import {
+  FacebookAdMessage,
+  EventMessage,
+  PixMessage,
+  LocationMessage,
+  MessageToChatWootConverter,
+  PollMessage,
+  ListMessage,
+  ShareContactMessage,
+  TextMessage,
+  UnsupportedMessage,
+  resolveProtoMessage,
+} from '@waha/apps/chatwoot/messages/to/chatwoot';

@Processor(QueueName.WAHA_MESSAGE_ANY, { concurrency: JOB_CONCURRENCY })
 export class WAHAMessageAnyConsumer extends ChatWootWAHABaseConsumer {
@@ -63,138 +66,66 @@ export class WAHAMessageAnyConsumer extends ChatWootWAHABaseConsumer {
  }
 }

-function isEmptyString(content: string) {
-  if (!content) {
-    return true;
-  }
-  return content == '' || content == '\n';
-}
-
 class MessageAnyHandler extends MessageBaseHandler<WAMessage> {
  protected async getMessage(
    payload: WAMessage,
  ): Promise<ChatWootMessagePartial> {
-    const protoMessage = this.getProtoMessage(payload);
-    let msg = await this.getTextMessage(payload, protoMessage);
+    let converter: MessageToChatWootConverter;
+    let msg: ChatWootMessagePartial;
+    const protoMessage = resolveProtoMessage(payload);
+
+    // Check for Facebook Ad first - but let it use the normal flow later
+    converter = new FacebookAdMessage(this.l, this.logger);
+    msg = await converter.convert(payload, protoMessage);
    if (msg) {
      return msg;
    }
-    msg = this.getLocationMessage(payload, protoMessage);
+
+    converter = new TextMessage(this.l, this.logger, this.waha);
+    msg = await converter.convert(payload, null);
    if (msg) {
      return msg;
    }
-    msg = this.getShareContactMessage(payload, protoMessage);
+
+    converter = new LocationMessage(this.l);
+    msg = await converter.convert(payload, protoMessage);
    if (msg) {
      return msg;
    }
-    return this.getUnsupportedMessage();
-  }

-  protected async getTextMessage(
-    payload: WAMessage,
-    _: proto.Message | null,
-  ): Promise<ChatWootMessagePartial | null> {
-    const attachments = await this.getAttachments(payload);
-    let content = this.l
-      .key(TKey.WA_TO_CW_MESSAGE)
-      .render({ payload: payload });
-    if (isEmptyString(content) && attachments.length == 0) {
-      return null;
-    }
-    if (isEmptyString(content)) {
-      content = null;
-    }
-    return {
-      content: WhatsappToMarkdown(content),
-      attachments: attachments,
-      private: undefined,
-    };
-  }
-
-  private getLocationMessage(
-    payload: WAMessage,
-    message: proto.Message | null,
-  ): ChatWootMessagePartial | null {
-    const hasLocation = !lodash.isEmpty(message?.locationMessage);
-    const hasLiveLocation = !lodash.isEmpty(message?.liveLocationMessage);
-    if (!hasLocation && !hasLiveLocation) {
-      return null;
-    }
-    const location = this.l.key(TKey.WA_TO_CW_MESSAGE_LOCATION).r({
-      payload,
-      message,
-    });
-    if (isEmptyString(location)) {
-      return null;
-    }
-    return {
-      content: location,
-      attachments: [],
-      private: undefined,
-    };
-  }
-
-  private getShareContactMessage(
-    _payload: WAMessage,
-    message: proto.Message | null,
-  ): ChatWootMessagePartial | null {
-    let vcards: string[] = [];
-
-    if (!lodash.isEmpty(message?.contactsArrayMessage?.contacts)) {
-      vcards = message!.contactsArrayMessage!.contacts.map((c) => c.vcard);
-    } else if (!lodash.isEmpty(message?.contactMessage?.vcard)) {
-      vcards = [message!.contactMessage!.vcard];
-    }
-    if (vcards.length === 0) {
-      return null;
-    }
-    const attachments: SendAttachment[] = vcards.map((v, i) => ({
-      content: Buffer.from(v, 'utf8').toString('base64'),
-      encoding: 'base64',
-      filename: `vcard-${i + 1}.vcf`,
-    }));
-    let contacts: SimpleVCardInfo[] = [];
-    try {
-      contacts = vcards.map(parseVCardV3);
-    } catch (err) {
-      this.logger.error(
-        `Error parsing some vcards: vcards=${vcards}, err=${err}`,
-      );
-    }
-    const msg = this.l.key(TKey.WA_TO_CW_MESSAGE_CONTACTS).r({ contacts });
-    if (contacts.length === 0 && attachments.length === 0) {
-      return null;
+    converter = new ShareContactMessage(this.l, this.logger);
+    msg = await converter.convert(payload, protoMessage);
+    if (msg) {
+      return msg;
    }

-    return {
-      content: msg,
-      attachments: attachments,
-      private: undefined,
-    };
-  }
-
-  private getUnsupportedMessage(): ChatWootMessagePartial {
-    const unsupported = this.l
-      .key(TKey.WA_TO_CW_MESSAGE_UNSUPPORTED)
-      .render({ details: JobLink(this.job) });
-    return {
-      content: unsupported,
-      attachments: [],
-      private: true,
-    };
-  }
-
-  private getProtoMessage(payload: WAMessage): proto.Message | null {
-    // GOWS
-    if (payload._data.Message) {
-      return payload._data.Message;
+    converter = new PollMessage(this.l);
+    msg = await converter.convert(payload, protoMessage);
+    if (msg) {
+      return msg;
    }
-    // NOWEB
-    if (payload._data.message) {
-      return payload._data.message;
+
+    converter = new ListMessage(this.l);
+    msg = await converter.convert(payload, protoMessage);
+    if (msg) {
+      return msg;
    }
-    // WEBJS - not available
-    return null;
+
+    converter = new EventMessage(this.l);
+    msg = await converter.convert(payload, protoMessage);
+    if (msg) {
+      return msg;
+    }
+
+    converter = new PixMessage(this.l, this.logger);
+    msg = await converter.convert(payload, protoMessage);
+    if (msg) {
+      return msg;
+    }
+
+    converter = new UnsupportedMessage(this.l, this.job);
+    msg = await converter.convert(payload, protoMessage);
+    return msg;
  }

  getReplyToWhatsAppID(payload: WAMessage): string {
@@ -205,34 +136,4 @@ class MessageAnyHandler extends MessageBaseHandler<WAMessage> {
    const key = parseMessageIdSerialized(replyTo.id, true);
    return key.id;
  }
-
-  async getAttachments(payload: WAMessage): Promise<SendAttachment[]> {
-    //
-    // WAHA
-    //
-    const hasMedia = payload.media?.url;
-    if (!hasMedia) {
-      return [];
-    }
-
-    const attachments: SendAttachment[] = [];
-    const media = payload.media;
-    this.logger.info(`Downloading media from '${media.url}'...`);
-    const buffer = await this.waha.fetch(media.url);
-    const fileContent = buffer.toString('base64');
-    let filename = media.filename;
-    if (!filename) {
-      const extension = mime.extension(media.mimetype);
-      filename = `no-filename.${extension}`;
-    }
-
-    const attachment: SendAttachment = {
-      content: fileContent,
-      filename: filename,
-      encoding: 'base64',
-    };
-    attachments.push(attachment);
-    this.logger.info(`Downloaded media from '${media.url}' as '${filename}'`);
-    return attachments;
-  }
 }
@@ -6,9 +6,8 @@ import {
  ChatWootMessagePartial,
  ChatWootWAHABaseConsumer,
  IMessageInfo,
+  MessageBaseHandler,
 } from '@waha/apps/chatwoot/consumers/waha/base';
-import { MessageBaseHandler } from '@waha/apps/chatwoot/consumers/waha/base';
-import { WhatsappToMarkdown } from '@waha/apps/chatwoot/text';
 import { SessionManager } from '@waha/core/abc/manager.abc';
 import { RMutexService } from '@waha/modules/rmutex/rmutex.service';
 import { WAHAEvents } from '@waha/structures/enums.dto';
@@ -19,10 +18,12 @@ import {
 import { Job } from 'bullmq';
 import { PinoLogger } from 'nestjs-pino';

-import { SendAttachment } from '../../client/types';
 import { WAHASessionAPI } from '../../session/WAHASelf';
-import { TKey } from '@waha/apps/chatwoot/i18n/templates';
-import { WAMessage } from '@waha/structures/responses.dto';
+import {
+  MessageEdited,
+  MessageToChatWootConverter,
+  resolveProtoMessage,
+} from '@waha/apps/chatwoot/messages/to/chatwoot';

@Processor(QueueName.WAHA_MESSAGE_EDITED, { concurrency: JOB_CONCURRENCY })
 export class WAHAMessageEditedConsumer extends ChatWootWAHABaseConsumer {
@@ -63,25 +64,12 @@ class MessageEditedHandler extends MessageBaseHandler<WAMessageEditedBody> {
  protected async getMessage(
    payload: WAMessageEditedBody,
  ): Promise<ChatWootMessagePartial> {
-    const body = payload.body;
-    const formatted = WhatsappToMarkdown(body);
-    const content = this.l
-      .key(TKey.MESSAGE_EDITED_IN_WHATSAPP)
-      .render({ text: formatted });
-    return {
-      content: content,
-      attachments: [],
-      private: undefined,
-    };
+    const protoMessage = resolveProtoMessage(payload);
+    const converter: MessageToChatWootConverter = new MessageEdited(this.l);
+    return converter.convert(payload, protoMessage);
  }

  getReplyToWhatsAppID(payload: WAMessageEditedBody): string {
    return payload.editedMessageId;
  }
-
-  async getAttachments(
-    payload: WAMessageEditedBody,
-  ): Promise<SendAttachment[]> {
-    return [];
-  }
 }
@@ -82,8 +82,4 @@ export class MessageReactionHandler extends MessageBaseHandler<WAMessageReaction
    const key = parseMessageIdSerialized(messageId, false);
    return key.id;
  }
-
-  async getAttachments(payload: WAMessageReaction): Promise<SendAttachment[]> {
-    return [];
-  }
 }
@@ -39,6 +39,12 @@ export class ChatWootErrorReporter {
    }
    const template = this.l.key(TKey.JOB_REPORT_ERROR);
    const nextDelay = NextAttemptDelayInWholeSeconds(this.job);
+    if (nextDelay) {
+      // TODO: Add a way to enable it back in config
+      // https://github.com/devlikeapro/waha/issues/1395
+      // There's retries more left - ignore it for now
+      return;
+    }
    const attempts = {
      current: this.job.attemptsMade + 1,
      max: this.job.opts?.attempts || 1,
@@ -77,6 +83,10 @@ export class ChatWootErrorReporter {
    type: MessageType,
    replyTo?: number,
  ): Promise<void> {
+    // TODO: Add a way to enable it back in config
+    // https://github.com/devlikeapro/waha/issues/1395
+    return null;
+
    const template = this.l.key(TKey.JOB_REPORT_SUCCEEDED);
    const attempts = {
      current: this.job.attemptsMade + 1,
@@ -1,9 +1,19 @@
 import * as Mustache from 'mustache';
 import { TemplatePayloads, TKey } from '@waha/apps/chatwoot/i18n/templates';
+import Long from 'long';
+import { ensureNumber } from '@waha/core/engines/noweb/utils';

 export class Locale {
  constructor(private readonly strings: Record<string, string>) {}

+  /**
+   * Return Base Locale
+   * For number, datetime, currency formats
+   */
+  get locale(): string {
+    return this.strings['locale.base'] || 'en';
+  }
+
  key<K extends TKey>(key: K): Template<K> {
    return new Template(this.strings[key] || key);
  }
@@ -15,13 +25,64 @@ export class Locale {
  override(strings: Record<string, string>): Locale {
    return new Locale({ ...this.strings, ...strings });
  }
+
+  FormatCurrency(
+    currency: string,
+    value: number | null,
+    offset: number = 1,
+  ): string | null {
+    if (value == null) {
+      return null;
+    }
+    if (!currency) {
+      return null;
+    }
+
+    offset = offset || 1;
+    try {
+      const fmt = new Intl.NumberFormat(this.locale, {
+        style: 'currency',
+        currency: currency,
+      });
+      return fmt.format(value / offset);
+    } catch (err) {
+      return `${currency} ${value}`;
+    }
+  }
+
+  FormatDatetime(date: Date | null): string | null {
+    if (!date) {
+      return null;
+    }
+    const options: any = this.strings['datetime'] || {};
+    options.timeZone = options.timeZone || options.timezone || process.env.TZ;
+    return date.toLocaleString(this.locale, options);
+  }
+
+  FormatTimestamp(timestamp: Long | string | number | null): string | null {
+    const value = ensureNumber(timestamp);
+    if (!value) {
+      return undefined;
+    }
+    if (!Number.isFinite(value)) {
+      return undefined;
+    }
+    const milliseconds = value >= 1e12 ? value : value * 1000;
+    const date = new Date(milliseconds);
+    if (Number.isNaN(date.getTime())) {
+      return undefined;
+    }
+    return this.FormatDatetime(date);
+  }
 }

 export class Template<K extends TKey> {
  constructor(private readonly template: string) {}

  render(data: TemplatePayloads[K]): string {
-    return Mustache.render(this.template, data);
+    const text = Mustache.render(this.template, data);
+    // Remove /n at the end if any
+    return text.replace(/\n$/, '');
  }

  r(data: TemplatePayloads[K]): string {
@@ -1,8 +1,28 @@
 # Arabic translations for ChatWoot integration
 locale.name: '🇦🇪 العربية (Arabic)'
-app.inbox.contact.name: 'تكامل واتساب (WAHA)'
+
+# رمز اللغة الأساسي - يجب أن يكون محليًا صالحًا وفق BCP 47
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# تستخدمه WAHA لعرض الأرقام والعملات والتاريخ/الوقت
+locale.base: 'ar-AE'
+
+app.inbox.contact.name: 'تكامل واتساب'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'

+# "options" من date.toLocaleString
+# https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#options
+datetime:
+  locales: ar-AE
+  day: 2-digit
+  month: 2-digit
+  year: numeric
+  hour: 2-digit
+  minute: 2-digit
+  # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#timezonename
+  timeZoneName: shortGeneric
+  # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+  # timeZone: 'Asia/Dubai'
+
 job.report.error: |-
  ⚠️ **{{{header}}}**
  {{#attempts.nextDelay}}
@@ -216,7 +236,19 @@ whatsapp.to.chatwoot.message.location: |-
  {{#locationMessage}}
  📍 **الموقع المشترك**

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **العنوان:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **الموقع الإلكتروني:** {{url}}
+  {{/url}}
+
+  🔗 **عرض على الخريطة:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/locationMessage}}

@@ -224,13 +256,127 @@ whatsapp.to.chatwoot.message.location: |-
  📍📡 **مشاركة الموقع المباشر**
  افتح **WhatsApp** لعرض التحديثات اللحظية.

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **العنوان:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **الموقع الإلكتروني:** {{url}}
+  {{/url}}
+
+  🔗 **عرض على الخريطة:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/liveLocationMessage}}
  {{/message}}

+whatsapp.to.chatwoot.message.poll: |-
+  {{#poll}}
+  📊 **استطلاع**
+
+  **{{name}}**
+  {{#options}}
+  - {{optionName}}
+  {{/options}}
+  {{/poll}}
+
+whatsapp.to.chatwoot.message.list: |-
+  {{#message.listMessage}}
+  {{#title}}
+  *{{{title}}}*
+  {{/title}}
+  {{#description}}
+  {{{description}}}
+  {{/description}}
+  {{#footerText}}
+  {{{footerText}}}
+  {{/footerText}}
+
+  {{#buttonText}}
+  {{{buttonText}}}
+  {{/buttonText}}
+  {{#sections}}
+  {{#title}}
+  {{{title}}}:
+  {{/title}}
+  {{#rows}}
+  {{#title}}
+  - {{{title}}}
+  {{/title}}
+  {{/rows}}
+
+  {{/sections}}
+  {{/message.listMessage}}
+
+whatsapp.to.chatwoot.message.event: |-
+  {{#message}}
+  {{#eventMessage}}
+  📅 **حدث**
+
+  **{{name}}**
+  {{#description}}
+  {{description}}
+  {{/description}}
+
+  {{#location.name}}
+  📍 **الموقع:** {{location.name}}
+  {{/location.name}}
+  {{#startTime}}
+  🕐 **البدء:** {{startTime}}
+  {{/startTime}}
+  {{#endTime}}
+  🕐 **الانتهاء:** {{endTime}}
+  {{/endTime}}
+  {{#joinLink}}
+  🔗 **رابط الانضمام:** [{{joinLink}}]({{joinLink}})
+  {{/joinLink}}
+  {{/eventMessage}}
+  {{/message}}
+
+whatsapp.to.chatwoot.message.pix: |-
+  💳 **PIX - نسخ ولصق**
+
+  {{#pixData}}
+  {{#merchantName}}
+  **{{merchantName}}**
+  {{/merchantName}}
+
+  {{#key}}
+  **مفتاح PIX:** {{key}}
+  {{/key}}
+  {{#keyType}}
+  **النوع:** {{keyType}}
+  {{/keyType}}
+  {{#totalAmount}}
+  **المبلغ:** {{totalAmountFormatted}}
+  {{/totalAmount}}
+  {{#referenceId}}
+  **المرجع:** {{referenceId}}
+  {{/referenceId}}
+
+  💳 **تم إرسال PIX نسخ ولصق**
+  {{/pixData}}
+
 whatsapp.to.chatwoot.message.unsupported: |-
  ⚠️ **هذا النوع من الرسائل غير مدعوم في ChatWoot.**
  📱 يرجى فتح **WhatsApp** لعرضه.

  التفاصيل: [{{{details.text}}}]({{{details.url}}})
+
+whatsapp.to.chatwoot.message.facebook.ad: |-
+  📢 **إعلان فيسبوك**
+
+  **العنوان:** {{{adData.title}}}
+
+  **الوصف:**
+  {{{adData.body}}}
+
+  **رابط الإعلان:** [عرض على فيسبوك]({{{adData.sourceUrl}}})
+  **معرّف الإعلان:** {{{adData.sourceId}}}
+
+  ---
+  💬 **رسالة العميل:**
+  {{{payload.body}}}
@@ -1,8 +1,28 @@
 # Bengali translations for ChatWoot integration
 locale.name: '🇧🇩 বাংলা (Bengali)'
-app.inbox.contact.name: 'হোয়াটসঅ্যাপ ইন্টিগ্রেশন (WAHA)'
+
+# বেস লোকেল কোড - এটি একটি বৈধ BCP 47 লোকেল হতে হবে
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA এটি সংখ্যা, মুদ্রা এবং তারিখ/সময়ের ফরম্যাটিংয়ে ব্যবহার করে।
+locale.base: 'bn-BD'
+
+app.inbox.contact.name: 'হোয়াটসঅ্যাপ ইন্টিগ্রেশন'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'

+# date.toLocaleString এর "options"
+# https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#options
+datetime:
+  locales: bn-BD
+  day: 2-digit
+  month: 2-digit
+  year: numeric
+  hour: 2-digit
+  minute: 2-digit
+  # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#timezonename
+  timeZoneName: shortGeneric
+  # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+  # timeZone: 'Asia/Dhaka'
+
 job.report.error: |-
  ⚠️ **{{{header}}}**
  {{#attempts.nextDelay}}
@@ -216,7 +236,19 @@ whatsapp.to.chatwoot.message.location: |-
  {{#locationMessage}}
  📍 **শেয়ার করা লোকেশন**

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **ঠিকানা:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **ওয়েবসাইট:** {{url}}
+  {{/url}}
+
+  🔗 **মানচিত্রে দেখুন:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/locationMessage}}

@@ -224,13 +256,127 @@ whatsapp.to.chatwoot.message.location: |-
  📍📡 **লাইভ লোকেশন শেয়ার করা হচ্ছে**
  রিয়েল-টাইম আপডেট দেখতে **WhatsApp** খুলুন।

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **ঠিকানা:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **ওয়েবসাইট:** {{url}}
+  {{/url}}
+
+  🔗 **মানচিত্রে দেখুন:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/liveLocationMessage}}
  {{/message}}

+whatsapp.to.chatwoot.message.poll: |-
+  {{#poll}}
+  📊 **জরিপ**
+
+  **{{name}}**
+  {{#options}}
+  - {{optionName}}
+  {{/options}}
+  {{/poll}}
+
+whatsapp.to.chatwoot.message.list: |-
+  {{#message.listMessage}}
+  {{#title}}
+  *{{{title}}}*
+  {{/title}}
+  {{#description}}
+  {{{description}}}
+  {{/description}}
+  {{#footerText}}
+  {{{footerText}}}
+  {{/footerText}}
+
+  {{#buttonText}}
+  {{{buttonText}}}
+  {{/buttonText}}
+  {{#sections}}
+  {{#title}}
+  {{{title}}}:
+  {{/title}}
+  {{#rows}}
+  {{#title}}
+  - {{{title}}}
+  {{/title}}
+  {{/rows}}
+
+  {{/sections}}
+  {{/message.listMessage}}
+
+whatsapp.to.chatwoot.message.event: |-
+  {{#message}}
+  {{#eventMessage}}
+  📅 **ইভেন্ট**
+
+  **{{name}}**
+  {{#description}}
+  {{description}}
+  {{/description}}
+
+  {{#location.name}}
+  📍 **স্থান:** {{location.name}}
+  {{/location.name}}
+  {{#startTime}}
+  🕐 **শুরুর সময়:** {{startTime}}
+  {{/startTime}}
+  {{#endTime}}
+  🕐 **শেষের সময়:** {{endTime}}
+  {{/endTime}}
+  {{#joinLink}}
+  🔗 **যোগদানের লিঙ্ক:** [{{joinLink}}]({{joinLink}})
+  {{/joinLink}}
+  {{/eventMessage}}
+  {{/message}}
+
+whatsapp.to.chatwoot.message.pix: |-
+  💳 **PIX - কপি এবং পেস্ট**
+
+  {{#pixData}}
+  {{#merchantName}}
+  **{{merchantName}}**
+  {{/merchantName}}
+
+  {{#key}}
+  **PIX কী:** {{key}}
+  {{/key}}
+  {{#keyType}}
+  **ধরন:** {{keyType}}
+  {{/keyType}}
+  {{#totalAmount}}
+  **পরিমাণ:** {{totalAmountFormatted}}
+  {{/totalAmount}}
+  {{#referenceId}}
+  **রেফারেন্স:** {{referenceId}}
+  {{/referenceId}}
+
+  💳 **PIX কপি এবং পেস্ট পাঠানো হয়েছে**
+  {{/pixData}}
+
 whatsapp.to.chatwoot.message.unsupported: |-
  ⚠️ **এই ধরনের বার্তা ChatWoot-এ সমর্থিত নয়।**
  📱 এটি দেখতে অনুগ্রহ করে **WhatsApp** খুলুন।

  বিস্তারিত: [{{{details.text}}}]({{{details.url}}})
+
+whatsapp.to.chatwoot.message.facebook.ad: |-
+  📢 **ফেসবুক বিজ্ঞাপন**
+
+  **শিরোনাম:** {{{adData.title}}}
+
+  **বর্ণনা:**
+  {{{adData.body}}}
+
+  **বিজ্ঞাপনের লিংক:** [ফেসবুকে দেখুন]({{{adData.sourceUrl}}})
+  **বিজ্ঞাপনের আইডি:** {{{adData.sourceId}}}
+
+  ---
+  💬 **গ্রাহকের বার্তা:**
+  {{{payload.body}}}
@@ -1,8 +1,28 @@
 # German translations for ChatWoot integration
 locale.name: '🇩🇪 Deutsch (German)'
-app.inbox.contact.name: 'WhatsApp Integration (WAHA)'
+
+# Basis-Gebietsschema-Code - muss eine gültige BCP 47 Locale sein
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA nutzt ihn zur Darstellung von Zahlen, Währungen sowie Datum und Uhrzeit
+locale.base: 'de-DE'
+
+app.inbox.contact.name: 'WhatsApp Integration'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'

+# "Optionen" von date.toLocaleString
+# https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#options
+datetime:
+  locales: de-DE
+  day: 2-digit
+  month: 2-digit
+  year: numeric
+  hour: 2-digit
+  minute: 2-digit
+  # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#timezonename
+  timeZoneName: shortGeneric
+  # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+  # timeZone: 'Europe/Berlin'
+
 job.report.error: |-
  ⚠️ **{{{header}}}**
  {{#attempts.nextDelay}}
@@ -219,7 +239,19 @@ whatsapp.to.chatwoot.message.location: |-
  {{#locationMessage}}
  📍 **Geteilter Standort**

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **Adresse:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **Webseite:** {{url}}
+  {{/url}}
+
+  🔗 **Auf Karte ansehen:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/locationMessage}}

@@ -227,13 +259,127 @@ whatsapp.to.chatwoot.message.location: |-
  📍📡 **Live-Standort wird geteilt**
  Öffne **WhatsApp**, um Aktualisierungen in Echtzeit zu sehen.

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **Adresse:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **Webseite:** {{url}}
+  {{/url}}
+
+  🔗 **Auf Karte ansehen:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/liveLocationMessage}}
  {{/message}}

+whatsapp.to.chatwoot.message.poll: |-
+  {{#poll}}
+  📊 **Umfrage**
+
+  **{{name}}**
+  {{#options}}
+  - {{optionName}}
+  {{/options}}
+  {{/poll}}
+
+whatsapp.to.chatwoot.message.list: |-
+  {{#message.listMessage}}
+  {{#title}}
+  *{{{title}}}*
+  {{/title}}
+  {{#description}}
+  {{{description}}}
+  {{/description}}
+  {{#footerText}}
+  {{{footerText}}}
+  {{/footerText}}
+
+  {{#buttonText}}
+  {{{buttonText}}}
+  {{/buttonText}}
+  {{#sections}}
+  {{#title}}
+  {{{title}}}:
+  {{/title}}
+  {{#rows}}
+  {{#title}}
+  - {{{title}}}
+  {{/title}}
+  {{/rows}}
+
+  {{/sections}}
+  {{/message.listMessage}}
+
+whatsapp.to.chatwoot.message.event: |-
+  {{#message}}
+  {{#eventMessage}}
+  📅 **Veranstaltung**
+
+  **{{name}}**
+  {{#description}}
+  {{description}}
+  {{/description}}
+
+  {{#location.name}}
+  📍 **Ort:** {{location.name}}
+  {{/location.name}}
+  {{#startTime}}
+  🕐 **Beginn:** {{startTime}}
+  {{/startTime}}
+  {{#endTime}}
+  🕐 **Ende:** {{endTime}}
+  {{/endTime}}
+  {{#joinLink}}
+  🔗 **Teilnahmelink:** [{{joinLink}}]({{joinLink}})
+  {{/joinLink}}
+  {{/eventMessage}}
+  {{/message}}
+
+whatsapp.to.chatwoot.message.pix: |-
+  💳 **PIX - Kopieren und Einfügen**
+
+  {{#pixData}}
+  {{#merchantName}}
+  **{{merchantName}}**
+  {{/merchantName}}
+
+  {{#key}}
+  **PIX-Schlüssel:** {{key}}
+  {{/key}}
+  {{#keyType}}
+  **Typ:** {{keyType}}
+  {{/keyType}}
+  {{#totalAmount}}
+  **Betrag:** {{totalAmountFormatted}}
+  {{/totalAmount}}
+  {{#referenceId}}
+  **Referenz:** {{referenceId}}
+  {{/referenceId}}
+
+  💳 **PIX Kopieren und Einfügen gesendet**
+  {{/pixData}}
+
 whatsapp.to.chatwoot.message.unsupported: |-
  ⚠️ **Dieser Nachrichtentyp wird in ChatWoot nicht unterstützt.**
  📱 Bitte öffne **WhatsApp**, um ihn anzusehen.

  Details: [{{{details.text}}}]({{{details.url}}})
+
+whatsapp.to.chatwoot.message.facebook.ad: |-
+  📢 **FACEBOOK-ANZEIGE**
+
+  **Titel:** {{{adData.title}}}
+
+  **Beschreibung:**
+  {{{adData.body}}}
+
+  **Anzeigenlink:** [Auf Facebook ansehen]({{{adData.sourceUrl}}})
+  **Anzeigen-ID:** {{{adData.sourceId}}}
+
+  ---
+  💬 **Kundennachricht:**
+  {{{payload.body}}}
@@ -1,9 +1,27 @@
 # English translations for ChatWoot integration
 locale.name: '🇺🇸 English (English)'

-app.inbox.contact.name: 'WhatsApp Integration (WAHA)'
+# Base locale code - must be a valid BCP 47 locale
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA uses it for number, currency and datetime representation
+locale.base: 'en-US'
+
+app.inbox.contact.name: 'WhatsApp Integration'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'

+# "options" from date.toLocaleString
+# https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#options
+datetime:
+  day: 2-digit
+  month: 2-digit
+  year: numeric
+  hour: 2-digit
+  minute: 2-digit
+  # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#timezonename
+  timeZoneName: shortGeneric
+  # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+  # timeZone: 'America/New_York'
+
 job.report.error: |-
  ⚠️ **{{{header}}}**
  {{#attempts.nextDelay}}
@@ -95,7 +113,19 @@ whatsapp.to.chatwoot.message.location: |-
  {{#locationMessage}}
  📍 **Shared Location**

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **Address:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **Website:** {{url}}
+  {{/url}}
+
+  🔗 **View on map:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/locationMessage}}

@@ -103,17 +133,131 @@ whatsapp.to.chatwoot.message.location: |-
  📍📡 **Sharing Live Location**
  Open **WhatsApp** to see real-time updates.

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **Address:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **Website:** {{url}}
+  {{/url}}
+
+  🔗 **View on map:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/liveLocationMessage}}
  {{/message}}

+whatsapp.to.chatwoot.message.poll: |-
+  {{#poll}}
+  📊 **Poll**
+
+  **{{name}}**
+  {{#options}}
+  - {{optionName}}
+  {{/options}}
+  {{/poll}}
+
+whatsapp.to.chatwoot.message.list: |-
+  {{#message.listMessage}}
+  {{#title}}
+  *{{{title}}}*
+  {{/title}}
+  {{#description}}
+  {{{description}}}
+  {{/description}}
+  {{#footerText}}
+  {{{footerText}}}
+  {{/footerText}}
+
+  {{#buttonText}}
+  {{{buttonText}}}
+  {{/buttonText}}
+  {{#sections}}
+  {{#title}}
+  {{{title}}}:
+  {{/title}}
+  {{#rows}}
+  {{#title}}
+  - {{{title}}}
+  {{/title}}
+  {{/rows}}
+
+  {{/sections}}
+  {{/message.listMessage}}
+
+whatsapp.to.chatwoot.message.event: |-
+  {{#message}}
+  {{#eventMessage}}
+  📅 **Event**
+
+  **{{name}}**
+  {{#description}}
+  {{description}}
+  {{/description}}
+
+  {{#location.name}}
+  📍 **Location:** {{location.name}}
+  {{/location.name}}
+  {{#startTime}}
+  🕐 **Start:** {{startTime}}
+  {{/startTime}}
+  {{#endTime}}
+  🕐 **End:** {{endTime}}
+  {{/endTime}}
+  {{#joinLink}}
+  🔗 **Join Link:** [{{joinLink}}]({{joinLink}})
+  {{/joinLink}}
+  {{/eventMessage}}
+  {{/message}}
+
+whatsapp.to.chatwoot.message.pix: |-
+  💳 **PIX - Copy and Paste**
+
+  {{#pixData}}
+  {{#merchantName}}
+  **{{merchantName}}**
+  {{/merchantName}}
+
+  {{#key}}
+  **PIX Key:** {{key}}
+  {{/key}}
+  {{#keyType}}
+  **Type:** {{keyType}}
+  {{/keyType}}
+  {{#totalAmount}}
+  **Amount:** {{totalAmountFormatted}}
+  {{/totalAmount}}
+  {{#referenceId}}
+  **Reference:** {{referenceId}}
+  {{/referenceId}}
+
+  💳 **PIX Copy and Paste sent**
+  {{/pixData}}
+
 whatsapp.to.chatwoot.message.unsupported: |-
  ⚠️ **This message type is not supported in ChatWoot.**
  📱 Please open **WhatsApp** to view it.

  Details: [{{{details.text}}}]({{{details.url}}})

+whatsapp.to.chatwoot.message.facebook.ad: |-
+  📢 **FACEBOOK AD**
+
+  **Title:** {{{adData.title}}}
+
+  **Description:**
+  {{{adData.body}}}
+
+  **Ad Link:** [View on Facebook]({{{adData.sourceUrl}}})
+  **Ad ID:** {{{adData.sourceId}}}
+
+  ---
+  💬 **CUSTOMER MESSAGE:**
+  {{{payload.body}}}
+
 app.connected.message: |-
  🔗 **CONNECTED: WhatsApp Session to ChatWoot Inbox**

@@ -1,8 +1,28 @@
 # Spanish translations for ChatWoot integration
 locale.name: '🇪🇸 Español (Spanish)'
-app.inbox.contact.name: 'Integración de WhatsApp (WAHA)'
+
+# Código de locale base - debe ser un locale BCP 47 válido
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA lo utiliza para formatear números, moneda y fecha/hora
+locale.base: 'es-ES'
+
+app.inbox.contact.name: 'Integración de WhatsApp'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'

+# "opciones" de date.toLocaleString
+# https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#options
+datetime:
+  locales: es-ES
+  day: 2-digit
+  month: 2-digit
+  year: numeric
+  hour: 2-digit
+  minute: 2-digit
+  # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#timezonename
+  timeZoneName: shortGeneric
+  # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+  # timeZone: 'Europe/Madrid'
+
 job.report.error: |-
  ⚠️ **{{{header}}}**
  {{#attempts.nextDelay}}
@@ -219,7 +239,19 @@ whatsapp.to.chatwoot.message.location: |-
  {{#locationMessage}}
  📍 **Ubicación compartida**

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **Dirección:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **Sitio web:** {{url}}
+  {{/url}}
+
+  🔗 **Ver en el mapa:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/locationMessage}}

@@ -227,13 +259,127 @@ whatsapp.to.chatwoot.message.location: |-
  📍📡 **Compartiendo ubicación en tiempo real**
  Abre **WhatsApp** para ver las actualizaciones en tiempo real.

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **Dirección:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **Sitio web:** {{url}}
+  {{/url}}
+
+  🔗 **Ver en el mapa:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/liveLocationMessage}}
  {{/message}}

+whatsapp.to.chatwoot.message.poll: |-
+  {{#poll}}
+  📊 **Encuesta**
+
+  **{{name}}**
+  {{#options}}
+  - {{optionName}}
+  {{/options}}
+  {{/poll}}
+
+whatsapp.to.chatwoot.message.list: |-
+  {{#message.listMessage}}
+  {{#title}}
+  *{{{title}}}*
+  {{/title}}
+  {{#description}}
+  {{{description}}}
+  {{/description}}
+  {{#footerText}}
+  {{{footerText}}}
+  {{/footerText}}
+
+  {{#buttonText}}
+  {{{buttonText}}}
+  {{/buttonText}}
+  {{#sections}}
+  {{#title}}
+  {{{title}}}:
+  {{/title}}
+  {{#rows}}
+  {{#title}}
+  - {{{title}}}
+  {{/title}}
+  {{/rows}}
+
+  {{/sections}}
+  {{/message.listMessage}}
+
+whatsapp.to.chatwoot.message.event: |-
+  {{#message}}
+  {{#eventMessage}}
+  📅 **Evento**
+
+  **{{name}}**
+  {{#description}}
+  {{description}}
+  {{/description}}
+
+  {{#location.name}}
+  📍 **Ubicación:** {{location.name}}
+  {{/location.name}}
+  {{#startTime}}
+  🕐 **Inicio:** {{startTime}}
+  {{/startTime}}
+  {{#endTime}}
+  🕐 **Fin:** {{endTime}}
+  {{/endTime}}
+  {{#joinLink}}
+  🔗 **Enlace para unirse:** [{{joinLink}}]({{joinLink}})
+  {{/joinLink}}
+  {{/eventMessage}}
+  {{/message}}
+
+whatsapp.to.chatwoot.message.pix: |-
+  💳 **PIX - Copiar y Pegar**
+
+  {{#pixData}}
+  {{#merchantName}}
+  **{{merchantName}}**
+  {{/merchantName}}
+
+  {{#key}}
+  **Clave PIX:** {{key}}
+  {{/key}}
+  {{#keyType}}
+  **Tipo:** {{keyType}}
+  {{/keyType}}
+  {{#totalAmount}}
+  **Importe:** {{totalAmountFormatted}}
+  {{/totalAmount}}
+  {{#referenceId}}
+  **Referencia:** {{referenceId}}
+  {{/referenceId}}
+
+  💳 **PIX Copiar y Pegar enviado**
+  {{/pixData}}
+
 whatsapp.to.chatwoot.message.unsupported: |-
  ⚠️ **Este tipo de mensaje no es compatible con ChatWoot.**
  📱 Por favor, abre **WhatsApp** para verlo.

  Detalles: [{{{details.text}}}]({{{details.url}}})
+
+whatsapp.to.chatwoot.message.facebook.ad: |-
+  📢 **ANUNCIO DE FACEBOOK**
+
+  **Título:** {{{adData.title}}}
+
+  **Descripción:**
+  {{{adData.body}}}
+
+  **Enlace del anuncio:** [Ver en Facebook]({{{adData.sourceUrl}}})
+  **ID del anuncio:** {{{adData.sourceId}}}
+
+  ---
+  💬 **Mensaje del cliente:**
+  {{{payload.body}}}
@@ -1,8 +1,28 @@
 # Persian translations for ChatWoot integration
 locale.name: '🇮🇷 فارسی (Persian)'
-app.inbox.contact.name: 'ادغام واتساپ (WAHA)'
+
+# کد محلی پایه - باید یک محلی معتبر BCP 47 باشد
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA از آن برای نمایش اعداد، ارز و تاریخ/زمان استفاده می‌کند
+locale.base: 'fa-IR'
+
+app.inbox.contact.name: 'ادغام واتساپ'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'

+# گزینه‌های "options" از date.toLocaleString
+# https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#options
+datetime:
+  locales: fa-IR
+  day: 2-digit
+  month: 2-digit
+  year: numeric
+  hour: 2-digit
+  minute: 2-digit
+  # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#timezonename
+  timeZoneName: shortGeneric
+  # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+  # timeZone: 'Asia/Tehran'
+
 job.report.error: |-
  ⚠️ **{{{header}}}**
  {{#attempts.nextDelay}}
@@ -216,7 +236,19 @@ whatsapp.to.chatwoot.message.location: |-
  {{#locationMessage}}
  📍 **موقعیت مکانی به‌اشتراک‌گذاشته‌شده**

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **آدرس:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **وب‌سایت:** {{url}}
+  {{/url}}
+
+  🔗 **مشاهده روی نقشه:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/locationMessage}}

@@ -224,13 +256,127 @@ whatsapp.to.chatwoot.message.location: |-
  📍📡 **اشتراک‌گذاری موقعیت مکانی زنده**
  برای دیدن به‌روزرسانی‌های لحظه‌ای **WhatsApp** را باز کنید.

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **آدرس:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **وب‌سایت:** {{url}}
+  {{/url}}
+
+  🔗 **مشاهده روی نقشه:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/liveLocationMessage}}
  {{/message}}

+whatsapp.to.chatwoot.message.poll: |-
+  {{#poll}}
+  📊 **نظرسنجی**
+
+  **{{name}}**
+  {{#options}}
+  - {{optionName}}
+  {{/options}}
+  {{/poll}}
+
+whatsapp.to.chatwoot.message.list: |-
+  {{#message.listMessage}}
+  {{#title}}
+  *{{{title}}}*
+  {{/title}}
+  {{#description}}
+  {{{description}}}
+  {{/description}}
+  {{#footerText}}
+  {{{footerText}}}
+  {{/footerText}}
+
+  {{#buttonText}}
+  {{{buttonText}}}
+  {{/buttonText}}
+  {{#sections}}
+  {{#title}}
+  {{{title}}}:
+  {{/title}}
+  {{#rows}}
+  {{#title}}
+  - {{{title}}}
+  {{/title}}
+  {{/rows}}
+
+  {{/sections}}
+  {{/message.listMessage}}
+
+whatsapp.to.chatwoot.message.event: |-
+  {{#message}}
+  {{#eventMessage}}
+  📅 **رویداد**
+
+  **{{name}}**
+  {{#description}}
+  {{description}}
+  {{/description}}
+
+  {{#location.name}}
+  📍 **مکان:** {{location.name}}
+  {{/location.name}}
+  {{#startTime}}
+  🕐 **شروع:** {{startTime}}
+  {{/startTime}}
+  {{#endTime}}
+  🕐 **پایان:** {{endTime}}
+  {{/endTime}}
+  {{#joinLink}}
+  🔗 **لینک پیوستن:** [{{joinLink}}]({{joinLink}})
+  {{/joinLink}}
+  {{/eventMessage}}
+  {{/message}}
+
+whatsapp.to.chatwoot.message.pix: |-
+  💳 **PIX - کپی و چسباندن**
+
+  {{#pixData}}
+  {{#merchantName}}
+  **{{merchantName}}**
+  {{/merchantName}}
+
+  {{#key}}
+  **کلید PIX:** {{key}}
+  {{/key}}
+  {{#keyType}}
+  **نوع:** {{keyType}}
+  {{/keyType}}
+  {{#totalAmount}}
+  **مبلغ:** {{totalAmountFormatted}}
+  {{/totalAmount}}
+  {{#referenceId}}
+  **شناسه مرجع:** {{referenceId}}
+  {{/referenceId}}
+
+  💳 **PIX کپی و چسباندن ارسال شد**
+  {{/pixData}}
+
 whatsapp.to.chatwoot.message.unsupported: |-
  ⚠️ **این نوع پیام در ChatWoot پشتیبانی نمی‌شود.**
  📱 لطفاً برای مشاهده آن **WhatsApp** را باز کنید.

  جزئیات: [{{{details.text}}}]({{{details.url}}})
+
+whatsapp.to.chatwoot.message.facebook.ad: |-
+  📢 **آگهی فیس‌بوک**
+
+  **عنوان:** {{{adData.title}}}
+
+  **توضیحات:**
+  {{{adData.body}}}
+
+  **لینک آگهی:** [مشاهده در فیس‌بوک]({{{adData.sourceUrl}}})
+  **شناسه آگهی:** {{{adData.sourceId}}}
+
+  ---
+  💬 **پیام مشتری:**
+  {{{payload.body}}}
@@ -1,8 +1,28 @@
 # French translations for ChatWoot integration
 locale.name: '🇫🇷 Français (French)'
-app.inbox.contact.name: 'Intégration WhatsApp (WAHA)'
+
+# Code de locale de base - doit être une locale BCP 47 valide
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA l'utilise pour le formatage des nombres, devises et dates/heures
+locale.base: 'fr-FR'
+
+app.inbox.contact.name: 'Intégration WhatsApp'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'

+# "options" de date.toLocaleString
+# https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#options
+datetime:
+  locales: fr-FR
+  day: 2-digit
+  month: 2-digit
+  year: numeric
+  hour: 2-digit
+  minute: 2-digit
+  # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#timezonename
+  timeZoneName: shortGeneric
+  # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+  # timeZone: 'Europe/Paris'
+
 job.report.error: |-
  ⚠️ **{{{header}}}**
  {{#attempts.nextDelay}}
@@ -216,7 +236,19 @@ whatsapp.to.chatwoot.message.location: |-
  {{#locationMessage}}
  📍 **Position partagée**

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **Adresse :** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **Site web :** {{url}}
+  {{/url}}
+
+  🔗 **Voir sur la carte :** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/locationMessage}}

@@ -224,13 +256,127 @@ whatsapp.to.chatwoot.message.location: |-
  📍📡 **Partage de position en direct**
  Ouvrez **WhatsApp** pour voir les mises à jour en temps réel.

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **Adresse :** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **Site web :** {{url}}
+  {{/url}}
+
+  🔗 **Voir sur la carte :** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/liveLocationMessage}}
  {{/message}}

+whatsapp.to.chatwoot.message.poll: |-
+  {{#poll}}
+  📊 **Sondage**
+
+  **{{name}}**
+  {{#options}}
+  - {{optionName}}
+  {{/options}}
+  {{/poll}}
+
+whatsapp.to.chatwoot.message.list: |-
+  {{#message.listMessage}}
+  {{#title}}
+  *{{{title}}}*
+  {{/title}}
+  {{#description}}
+  {{{description}}}
+  {{/description}}
+  {{#footerText}}
+  {{{footerText}}}
+  {{/footerText}}
+
+  {{#buttonText}}
+  {{{buttonText}}}
+  {{/buttonText}}
+  {{#sections}}
+  {{#title}}
+  {{{title}}}:
+  {{/title}}
+  {{#rows}}
+  {{#title}}
+  - {{{title}}}
+  {{/title}}
+  {{/rows}}
+
+  {{/sections}}
+  {{/message.listMessage}}
+
+whatsapp.to.chatwoot.message.event: |-
+  {{#message}}
+  {{#eventMessage}}
+  📅 **Événement**
+
+  **{{name}}**
+  {{#description}}
+  {{description}}
+  {{/description}}
+
+  {{#location.name}}
+  📍 **Lieu :** {{location.name}}
+  {{/location.name}}
+  {{#startTime}}
+  🕐 **Début :** {{startTime}}
+  {{/startTime}}
+  {{#endTime}}
+  🕐 **Fin :** {{endTime}}
+  {{/endTime}}
+  {{#joinLink}}
+  🔗 **Lien de participation :** [{{joinLink}}]({{joinLink}})
+  {{/joinLink}}
+  {{/eventMessage}}
+  {{/message}}
+
+whatsapp.to.chatwoot.message.pix: |-
+  💳 **PIX - Copier et Coller**
+
+  {{#pixData}}
+  {{#merchantName}}
+  **{{merchantName}}**
+  {{/merchantName}}
+
+  {{#key}}
+  **Clé PIX :** {{key}}
+  {{/key}}
+  {{#keyType}}
+  **Type :** {{keyType}}
+  {{/keyType}}
+  {{#totalAmount}}
+  **Montant :** {{totalAmountFormatted}}
+  {{/totalAmount}}
+  {{#referenceId}}
+  **Référence :** {{referenceId}}
+  {{/referenceId}}
+
+  💳 **PIX Copier et Coller envoyé**
+  {{/pixData}}
+
 whatsapp.to.chatwoot.message.unsupported: |-
  ⚠️ **Ce type de message n’est pas pris en charge dans ChatWoot.**
  📱 Veuillez ouvrir **WhatsApp** pour l’afficher.

  Détails: [{{{details.text}}}]({{{details.url}}})
+
+whatsapp.to.chatwoot.message.facebook.ad: |-
+  📢 **PUBLICITÉ FACEBOOK**
+
+  **Titre:** {{{adData.title}}}
+
+  **Description:**
+  {{{adData.body}}}
+
+  **Lien de l'annonce :** [Voir sur Facebook]({{{adData.sourceUrl}}})
+  **ID de l'annonce :** {{{adData.sourceId}}}
+
+  ---
+  💬 **Message du client :**
+  {{{payload.body}}}
@@ -1,8 +1,28 @@
 # Hebrew translations for ChatWoot integration
 locale.name: '🇮🇱 עברית (Hebrew)'
-app.inbox.contact.name: 'אינטגרציית וואטסאפ (WAHA)'
+
+# קוד הלוקאל הבסיסי - חייב להיות לוקאל תקין לפי BCP 47
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA משתמש בכך להצגת מספרים, מטבע ותאריך/שעה
+locale.base: 'he-IL'
+
+app.inbox.contact.name: 'אינטגרציית וואטסאפ'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'

+# "אפשרויות" של date.toLocaleString
+# https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#options
+datetime:
+  locales: he-IL
+  day: 2-digit
+  month: 2-digit
+  year: numeric
+  hour: 2-digit
+  minute: 2-digit
+  # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#timezonename
+  timeZoneName: shortGeneric
+  # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+  # timeZone: 'Asia/Jerusalem'
+
 job.report.error: |-
  ⚠️ **{{{header}}}**
  {{#attempts.nextDelay}}
@@ -216,7 +236,19 @@ whatsapp.to.chatwoot.message.location: |-
  {{#locationMessage}}
  📍 **מיקום משותף**

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **כתובת:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **אתר אינטרנט:** {{url}}
+  {{/url}}
+
+  🔗 **הצג במפה:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/locationMessage}}

@@ -224,13 +256,127 @@ whatsapp.to.chatwoot.message.location: |-
  📍📡 **משתף מיקום חי**
  פתח/י את **WhatsApp** כדי לראות עדכונים בזמן אמת.

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **כתובת:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **אתר אינטרנט:** {{url}}
+  {{/url}}
+
+  🔗 **הצג במפה:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/liveLocationMessage}}
  {{/message}}

+whatsapp.to.chatwoot.message.poll: |-
+  {{#poll}}
+  📊 **סקר**
+
+  **{{name}}**
+  {{#options}}
+  - {{optionName}}
+  {{/options}}
+  {{/poll}}
+
+whatsapp.to.chatwoot.message.list: |-
+  {{#message.listMessage}}
+  {{#title}}
+  *{{{title}}}*
+  {{/title}}
+  {{#description}}
+  {{{description}}}
+  {{/description}}
+  {{#footerText}}
+  {{{footerText}}}
+  {{/footerText}}
+
+  {{#buttonText}}
+  {{{buttonText}}}
+  {{/buttonText}}
+  {{#sections}}
+  {{#title}}
+  {{{title}}}:
+  {{/title}}
+  {{#rows}}
+  {{#title}}
+  - {{{title}}}
+  {{/title}}
+  {{/rows}}
+
+  {{/sections}}
+  {{/message.listMessage}}
+
+whatsapp.to.chatwoot.message.event: |-
+  {{#message}}
+  {{#eventMessage}}
+  📅 **אירוע**
+
+  **{{name}}**
+  {{#description}}
+  {{description}}
+  {{/description}}
+
+  {{#location.name}}
+  📍 **מיקום:** {{location.name}}
+  {{/location.name}}
+  {{#startTime}}
+  🕐 **התחלה:** {{startTime}}
+  {{/startTime}}
+  {{#endTime}}
+  🕐 **סיום:** {{endTime}}
+  {{/endTime}}
+  {{#joinLink}}
+  🔗 **קישור הצטרפות:** [{{joinLink}}]({{joinLink}})
+  {{/joinLink}}
+  {{/eventMessage}}
+  {{/message}}
+
+whatsapp.to.chatwoot.message.pix: |-
+  💳 **PIX - העתק והדבק**
+
+  {{#pixData}}
+  {{#merchantName}}
+  **{{merchantName}}**
+  {{/merchantName}}
+
+  {{#key}}
+  **מפתח PIX:** {{key}}
+  {{/key}}
+  {{#keyType}}
+  **סוג:** {{keyType}}
+  {{/keyType}}
+  {{#totalAmount}}
+  **סכום:** {{totalAmountFormatted}}
+  {{/totalAmount}}
+  {{#referenceId}}
+  **אסמכתא:** {{referenceId}}
+  {{/referenceId}}
+
+  💳 **PIX העתק והדבק נשלח**
+  {{/pixData}}
+
 whatsapp.to.chatwoot.message.unsupported: |-
  ⚠️ **סוג הודעה זה אינו נתמך ב-ChatWoot.**
  📱 אנא פתח/י את **WhatsApp** כדי לצפות בזה.

  פרטים: [{{{details.text}}}]({{{details.url}}})
+
+whatsapp.to.chatwoot.message.facebook.ad: |-
+  📢 **מודעת פייסבוק**
+
+  **כותרת:** {{{adData.title}}}
+
+  **תיאור:**
+  {{{adData.body}}}
+
+  **קישור למודעה:** [לצפייה בפייסבוק]({{{adData.sourceUrl}}})
+  **מזהה המודעה:** {{{adData.sourceId}}}
+
+  ---
+  💬 **הודעת הלקוח:**
+  {{{payload.body}}}
@@ -1,8 +1,28 @@
 # Hindi translations for ChatWoot integration
 locale.name: '🇮🇳 हिंदी (Hindi)'
-app.inbox.contact.name: 'व्हाट्सएप इंटीग्रेशन (WAHA)'
+
+# बेस लोकैल कोड - यह एक मान्य BCP 47 लोकैल होना चाहिए
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA इसे संख्याएँ, मुद्रा और दिनांक/समय प्रदर्शित करने के लिए उपयोग करता है।
+locale.base: 'hi-IN'
+
+app.inbox.contact.name: 'व्हाट्सएप इंटीग्रेशन'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'

+# date.toLocaleString की "options"
+# https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#options
+datetime:
+  locales: hi-IN
+  day: 2-digit
+  month: 2-digit
+  year: numeric
+  hour: 2-digit
+  minute: 2-digit
+  # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#timezonename
+  timeZoneName: shortGeneric
+  # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+  # timeZone: 'Asia/Kolkata'
+
 job.report.error: |-
  ⚠️ **{{{header}}}**
  {{#attempts.nextDelay}}
@@ -216,7 +236,19 @@ whatsapp.to.chatwoot.message.location: |-
  {{#locationMessage}}
  📍 **साझा स्थान**

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **पता:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **वेबसाइट:** {{url}}
+  {{/url}}
+
+  🔗 **मानचित्र पर देखें:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/locationMessage}}

@@ -224,13 +256,127 @@ whatsapp.to.chatwoot.message.location: |-
  📍📡 **लाइव लोकेशन साझा की जा रही है**
  रीयल-टाइम अपडेट देखने के लिए **WhatsApp** खोलें।

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **पता:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **वेबसाइट:** {{url}}
+  {{/url}}
+
+  🔗 **मानचित्र पर देखें:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/liveLocationMessage}}
  {{/message}}

+whatsapp.to.chatwoot.message.poll: |-
+  {{#poll}}
+  📊 **मतदान**
+
+  **{{name}}**
+  {{#options}}
+  - {{optionName}}
+  {{/options}}
+  {{/poll}}
+
+whatsapp.to.chatwoot.message.list: |-
+  {{#message.listMessage}}
+  {{#title}}
+  *{{{title}}}*
+  {{/title}}
+  {{#description}}
+  {{{description}}}
+  {{/description}}
+  {{#footerText}}
+  {{{footerText}}}
+  {{/footerText}}
+
+  {{#buttonText}}
+  {{{buttonText}}}
+  {{/buttonText}}
+  {{#sections}}
+  {{#title}}
+  {{{title}}}:
+  {{/title}}
+  {{#rows}}
+  {{#title}}
+  - {{{title}}}
+  {{/title}}
+  {{/rows}}
+
+  {{/sections}}
+  {{/message.listMessage}}
+
+whatsapp.to.chatwoot.message.event: |-
+  {{#message}}
+  {{#eventMessage}}
+  📅 **कार्यक्रम**
+
+  **{{name}}**
+  {{#description}}
+  {{description}}
+  {{/description}}
+
+  {{#location.name}}
+  📍 **स्थान:** {{location.name}}
+  {{/location.name}}
+  {{#startTime}}
+  🕐 **आरंभ:** {{startTime}}
+  {{/startTime}}
+  {{#endTime}}
+  🕐 **समाप्ति:** {{endTime}}
+  {{/endTime}}
+  {{#joinLink}}
+  🔗 **जुड़ने का लिंक:** [{{joinLink}}]({{joinLink}})
+  {{/joinLink}}
+  {{/eventMessage}}
+  {{/message}}
+
+whatsapp.to.chatwoot.message.pix: |-
+  💳 **PIX - कॉपी और पेस्ट**
+
+  {{#pixData}}
+  {{#merchantName}}
+  **{{merchantName}}**
+  {{/merchantName}}
+
+  {{#key}}
+  **PIX कुंजी:** {{key}}
+  {{/key}}
+  {{#keyType}}
+  **प्रकार:** {{keyType}}
+  {{/keyType}}
+  {{#totalAmount}}
+  **राशि:** {{totalAmountFormatted}}
+  {{/totalAmount}}
+  {{#referenceId}}
+  **संदर्भ:** {{referenceId}}
+  {{/referenceId}}
+
+  💳 **PIX कॉपी और पेस्ट भेजा गया**
+  {{/pixData}}
+
 whatsapp.to.chatwoot.message.unsupported: |-
  ⚠️ **इस प्रकार का संदेश ChatWoot में समर्थित नहीं है।**
  📱 इसे देखने के लिए कृपया **WhatsApp** खोलें।

  विवरण: [{{{details.text}}}]({{{details.url}}})
+
+whatsapp.to.chatwoot.message.facebook.ad: |-
+  📢 **फेसबुक विज्ञापन**
+
+  **शीर्षक:** {{{adData.title}}}
+
+  **विवरण:**
+  {{{adData.body}}}
+
+  **विज्ञापन लिंक:** [फेसबुक पर देखें]({{{adData.sourceUrl}}})
+  **विज्ञापन आईडी:** {{{adData.sourceId}}}
+
+  ---
+  💬 **ग्राहक संदेश:**
+  {{{payload.body}}}
@@ -1,8 +1,28 @@
 # Indonesian translations for ChatWoot integration
 locale.name: '🇮🇩 Bahasa Indonesia (Indonesian)'
-app.inbox.contact.name: 'Integrasi WhatsApp (WAHA)'
+
+# Kode locale dasar - harus berupa locale BCP 47 yang valid
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA menggunakannya untuk format angka, mata uang, dan tanggal/waktu
+locale.base: 'id-ID'
+
+app.inbox.contact.name: 'Integrasi WhatsApp'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'

+# "opsi" dari date.toLocaleString
+# https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#options
+datetime:
+  locales: id-ID
+  day: 2-digit
+  month: 2-digit
+  year: numeric
+  hour: 2-digit
+  minute: 2-digit
+  # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#timezonename
+  timeZoneName: shortGeneric
+  # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+  # timeZone: 'Asia/Jakarta'
+
 job.report.error: |-
  ⚠️ **{{{header}}}**
  {{#attempts.nextDelay}}
@@ -216,7 +236,19 @@ whatsapp.to.chatwoot.message.location: |-
  {{#locationMessage}}
  📍 **Lokasi yang dibagikan**

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **Alamat:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **Situs web:** {{url}}
+  {{/url}}
+
+  🔗 **Lihat di peta:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/locationMessage}}

@@ -224,13 +256,127 @@ whatsapp.to.chatwoot.message.location: |-
  📍📡 **Berbagi Lokasi Langsung**
  Buka **WhatsApp** untuk melihat pembaruan waktu nyata.

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **Alamat:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **Situs web:** {{url}}
+  {{/url}}
+
+  🔗 **Lihat di peta:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/liveLocationMessage}}
  {{/message}}

+whatsapp.to.chatwoot.message.poll: |-
+  {{#poll}}
+  📊 **Jajak Pendapat**
+
+  **{{name}}**
+  {{#options}}
+  - {{optionName}}
+  {{/options}}
+  {{/poll}}
+
+whatsapp.to.chatwoot.message.list: |-
+  {{#message.listMessage}}
+  {{#title}}
+  *{{{title}}}*
+  {{/title}}
+  {{#description}}
+  {{{description}}}
+  {{/description}}
+  {{#footerText}}
+  {{{footerText}}}
+  {{/footerText}}
+
+  {{#buttonText}}
+  {{{buttonText}}}
+  {{/buttonText}}
+  {{#sections}}
+  {{#title}}
+  {{{title}}}:
+  {{/title}}
+  {{#rows}}
+  {{#title}}
+  - {{{title}}}
+  {{/title}}
+  {{/rows}}
+
+  {{/sections}}
+  {{/message.listMessage}}
+
+whatsapp.to.chatwoot.message.event: |-
+  {{#message}}
+  {{#eventMessage}}
+  📅 **Acara**
+
+  **{{name}}**
+  {{#description}}
+  {{description}}
+  {{/description}}
+
+  {{#location.name}}
+  📍 **Lokasi:** {{location.name}}
+  {{/location.name}}
+  {{#startTime}}
+  🕐 **Mulai:** {{startTime}}
+  {{/startTime}}
+  {{#endTime}}
+  🕐 **Selesai:** {{endTime}}
+  {{/endTime}}
+  {{#joinLink}}
+  🔗 **Tautan bergabung:** [{{joinLink}}]({{joinLink}})
+  {{/joinLink}}
+  {{/eventMessage}}
+  {{/message}}
+
+whatsapp.to.chatwoot.message.pix: |-
+  💳 **PIX - Salin dan Tempel**
+
+  {{#pixData}}
+  {{#merchantName}}
+  **{{merchantName}}**
+  {{/merchantName}}
+
+  {{#key}}
+  **Kunci PIX:** {{key}}
+  {{/key}}
+  {{#keyType}}
+  **Jenis:** {{keyType}}
+  {{/keyType}}
+  {{#totalAmount}}
+  **Jumlah:** {{totalAmountFormatted}}
+  {{/totalAmount}}
+  {{#referenceId}}
+  **Referensi:** {{referenceId}}
+  {{/referenceId}}
+
+  💳 **PIX Salin dan Tempel terkirim**
+  {{/pixData}}
+
 whatsapp.to.chatwoot.message.unsupported: |-
  ⚠️ **Jenis pesan ini tidak didukung di ChatWoot.**
  📱 Silakan buka **WhatsApp** untuk melihatnya.

  Detail: [{{{details.text}}}]({{{details.url}}})
+
+whatsapp.to.chatwoot.message.facebook.ad: |-
+  📢 **IKLAN FACEBOOK**
+
+  **Judul:** {{{adData.title}}}
+
+  **Deskripsi:**
+  {{{adData.body}}}
+
+  **Tautan Iklan:** [Lihat di Facebook]({{{adData.sourceUrl}}})
+  **ID Iklan:** {{{adData.sourceId}}}
+
+  ---
+  💬 **Pesan Pelanggan:**
+  {{{payload.body}}}
@@ -1,8 +1,28 @@
 # Punjabi translations for ChatWoot integration
 locale.name: '🇵🇰 ਪੰਜਾਬੀ (Punjabi)'
-app.inbox.contact.name: 'ਵਟਸਐਪ ਇੰਟੀਗ੍ਰੇਸ਼ਨ (WAHA)'
+
+# ਅਧਾਰਭੂਤ ਲੋਕੇਲ ਕੋਡ - ਇਹ ਇੱਕ ਵੈਧ BCP 47 ਲੋਕੇਲ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA ਇਸਨੂੰ ਅੰਕ, ਕਰੰਸੀ ਅਤੇ ਤਾਰੀਖ/ਸਮੇਂ ਦੀ ਨਮਾਇਸ਼ ਲਈ ਵਰਤਦਾ ਹੈ
+locale.base: 'pa-PK'
+
+app.inbox.contact.name: 'ਵਟਸਐਪ ਇੰਟੀਗ੍ਰੇਸ਼ਨ'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'

+# date.toLocaleString ਦੀਆਂ "options"
+# https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#options
+datetime:
+  locales: pa-PK
+  day: 2-digit
+  month: 2-digit
+  year: numeric
+  hour: 2-digit
+  minute: 2-digit
+  # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#timezonename
+  timeZoneName: shortGeneric
+  # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+  # timeZone: 'Asia/Karachi'
+
 job.report.error: |-
  ⚠️ **{{{header}}}**
  {{#attempts.nextDelay}}
@@ -216,7 +236,19 @@ whatsapp.to.chatwoot.message.location: |-
  {{#locationMessage}}
  📍 **ਸਾਂਝੀ ਸਥਿਤੀ**

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **ਪਤਾ:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **ਵੈਬਸਾਈਟ:** {{url}}
+  {{/url}}
+
+  🔗 **ਨਕਸ਼ੇ 'ਤੇ ਵੇਖੋ:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/locationMessage}}

@@ -224,13 +256,127 @@ whatsapp.to.chatwoot.message.location: |-
  📍📡 **ਲਾਈਵ ਸਥਿਤੀ ਸਾਂਝੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ**
  ਰੀਅਲ-ਟਾਈਮ ਅੱਪਡੇਟ ਦੇਖਣ ਲਈ **WhatsApp** ਖੋਲ੍ਹੋ।

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **ਪਤਾ:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **ਵੈਬਸਾਈਟ:** {{url}}
+  {{/url}}
+
+  🔗 **ਨਕਸ਼ੇ 'ਤੇ ਵੇਖੋ:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/liveLocationMessage}}
  {{/message}}

+whatsapp.to.chatwoot.message.poll: |-
+  {{#poll}}
+  📊 **ਸਰਵੇਖਣ**
+
+  **{{name}}**
+  {{#options}}
+  - {{optionName}}
+  {{/options}}
+  {{/poll}}
+
+whatsapp.to.chatwoot.message.list: |-
+  {{#message.listMessage}}
+  {{#title}}
+  *{{{title}}}*
+  {{/title}}
+  {{#description}}
+  {{{description}}}
+  {{/description}}
+  {{#footerText}}
+  {{{footerText}}}
+  {{/footerText}}
+
+  {{#buttonText}}
+  {{{buttonText}}}
+  {{/buttonText}}
+  {{#sections}}
+  {{#title}}
+  {{{title}}}:
+  {{/title}}
+  {{#rows}}
+  {{#title}}
+  - {{{title}}}
+  {{/title}}
+  {{/rows}}
+
+  {{/sections}}
+  {{/message.listMessage}}
+
+whatsapp.to.chatwoot.message.event: |-
+  {{#message}}
+  {{#eventMessage}}
+  📅 **ਇਵੈਂਟ**
+
+  **{{name}}**
+  {{#description}}
+  {{description}}
+  {{/description}}
+
+  {{#location.name}}
+  📍 **ਸਥਾਨ:** {{location.name}}
+  {{/location.name}}
+  {{#startTime}}
+  🕐 **ਸ਼ੁਰੂਆਤ:** {{startTime}}
+  {{/startTime}}
+  {{#endTime}}
+  🕐 **ਖਾਤਮਾ:** {{endTime}}
+  {{/endTime}}
+  {{#joinLink}}
+  🔗 **ਜੁੜਨ ਲਈ ਲਿੰਕ:** [{{joinLink}}]({{joinLink}})
+  {{/joinLink}}
+  {{/eventMessage}}
+  {{/message}}
+
+whatsapp.to.chatwoot.message.pix: |-
+  💳 **PIX - ਕਾਪੀ ਅਤੇ ਪੇਸਟ**
+
+  {{#pixData}}
+  {{#merchantName}}
+  **{{merchantName}}**
+  {{/merchantName}}
+
+  {{#key}}
+  **PIX ਕੁੰਜੀ:** {{key}}
+  {{/key}}
+  {{#keyType}}
+  **ਕਿਸਮ:** {{keyType}}
+  {{/keyType}}
+  {{#totalAmount}}
+  **ਰਕਮ:** {{totalAmountFormatted}}
+  {{/totalAmount}}
+  {{#referenceId}}
+  **ਹਵਾਲਾ:** {{referenceId}}
+  {{/referenceId}}
+
+  💳 **PIX ਕਾਪੀ ਅਤੇ ਪੇਸਟ ਭੇਜਿਆ ਗਿਆ**
+  {{/pixData}}
+
 whatsapp.to.chatwoot.message.unsupported: |-
  ⚠️ **ਇਹ ਸੁਨੇਹੇ ਦੀ ਕਿਸਮ ChatWoot ਵਿੱਚ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ।**
  📱 ਇਸਨੂੰ ਦੇਖਣ ਲਈ ਕਿਰਪਾ ਕਰਕੇ **WhatsApp** ਖੋਲ੍ਹੋ।

  ਵੇਰਵੇ: [{{{details.text}}}]({{{details.url}}})
+
+whatsapp.to.chatwoot.message.facebook.ad: |-
+  📢 **ਫੇਸਬੁੱਕ ਵਿਗਿਆਪਨ**
+
+  **ਸਿਰਲੇਖ:** {{{adData.title}}}
+
+  **ਵੇਰਵਾ:**
+  {{{adData.body}}}
+
+  **ਵਿਗਿਆਪਨ ਲਿੰਕ:** [ਫੇਸਬੁੱਕ 'ਤੇ ਵੇਖੋ]({{{adData.sourceUrl}}})
+  **ਵਿਗਿਆਪਨ ਆਈਡੀ:** {{{adData.sourceId}}}
+
+  ---
+  💬 **ਗਾਹਕ ਦਾ ਸੁਨੇਹਾ:**
+  {{{payload.body}}}
@@ -1,8 +1,28 @@
 # Portuguese translations for ChatWoot integration
 locale.name: '🇧🇷🇵🇹 Português (Portuguese)'
-app.inbox.contact.name: 'Integração WhatsApp (WAHA)'
+
+# Código de locale base - deve ser um locale BCP 47 válido
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# A WAHA usa isso para formatar números, moeda e data/hora
+locale.base: 'pt-BR'
+
+app.inbox.contact.name: 'Integração WhatsApp'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'

+# "opções" de date.toLocaleString
+# https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#options
+datetime:
+  locales: pt-BR
+  day: 2-digit
+  month: 2-digit
+  year: numeric
+  hour: 2-digit
+  minute: 2-digit
+  # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#timezonename
+  timeZoneName: shortGeneric
+  # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+  timeZone: 'America/Sao_Paulo'
+
 job.report.error: |-
  ⚠️ **{{{header}}}**
  {{#attempts.nextDelay}}
@@ -219,7 +239,19 @@ whatsapp.to.chatwoot.message.location: |-
  {{#locationMessage}}
  📍 **Localização compartilhada**

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **Endereço:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **Site:** {{url}}
+  {{/url}}
+
+  🔗 **Ver no mapa:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/locationMessage}}

@@ -227,13 +259,131 @@ whatsapp.to.chatwoot.message.location: |-
  📍📡 **Compartilhando localização ao vivo**
  Abra o **WhatsApp** para ver as atualizações em tempo real.

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **Endereço:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **Site:** {{url}}
+  {{/url}}
+
+  🔗 **Ver no mapa:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/liveLocationMessage}}
  {{/message}}

+whatsapp.to.chatwoot.message.poll: |-
+  {{#poll}}
+  📊 **Enquete**
+
+  **{{name}}**
+  {{#options}}
+  - {{optionName}}
+  {{/options}}
+  {{/poll}}
+
+whatsapp.to.chatwoot.message.list: |-
+  {{#message.listMessage}}
+  {{#title}}
+  *{{{title}}}*
+  {{/title}}
+  {{#description}}
+  {{{description}}}
+  {{/description}}
+  {{#footerText}}
+  {{{footerText}}}
+  {{/footerText}}
+
+  {{#buttonText}}
+  {{{buttonText}}}
+  {{/buttonText}}
+  {{#sections}}
+  {{#title}}
+  {{{title}}}:
+  {{/title}}
+  {{#rows}}
+  {{#title}}
+  - {{{title}}}
+  {{/title}}
+  {{/rows}}
+
+  {{/sections}}
+  {{/message.listMessage}}
+
+whatsapp.to.chatwoot.message.event: |-
+  {{#message}}
+  {{#eventMessage}}
+  📅 **Evento**
+
+  **{{name}}**
+
+  {{#description}}
+  {{description}}
+  {{/description}}
+
+  {{#location.name}}
+  📍 **Local:** {{location.name}}
+  {{/location.name}}
+
+  {{#startTime}}
+  🕐 **Início:** {{startTime}}
+  {{/startTime}}
+
+  {{#endTime}}
+  🕐 **Fim:** {{endTime}}
+  {{/endTime}}
+
+  {{#joinLink}}
+  🔗 **Link de participação:** [{{joinLink}}]({{joinLink}})
+  {{/joinLink}}
+  {{/eventMessage}}
+  {{/message}}
+
+whatsapp.to.chatwoot.message.pix: |-
+  💳 **PIX - Copia e Cola**
+
+  {{#pixData}}
+  {{#merchantName}}
+  **{{merchantName}}**
+  {{/merchantName}}
+
+  {{#key}}
+  **Chave PIX:** {{key}}
+  {{/key}}
+  {{#keyType}}
+  **Tipo:** {{keyType}}
+  {{/keyType}}
+  {{#totalAmount}}
+  **Valor:** {{totalAmountFormatted}}
+  {{/totalAmount}}
+  {{#referenceId}}
+  **Referência:** {{referenceId}}
+  {{/referenceId}}
+
+  💳 **PIX Copia e Cola enviado**
+  {{/pixData}}
+
 whatsapp.to.chatwoot.message.unsupported: |-
  ⚠️ **Esse tipo de mensagem não é suportado no ChatWoot.**
  📱 Por favor, abra o **WhatsApp** para visualizá-la.

  Detalhes: [{{{details.text}}}]({{{details.url}}})
+
+whatsapp.to.chatwoot.message.facebook.ad: |-
+  📢 **ANÚNCIO DO FACEBOOK**
+
+  **Título:** {{{adData.title}}}
+
+  **Descrição:**
+  {{{adData.body}}}
+
+  **Link do Anúncio:** [Ver no Facebook]({{{adData.sourceUrl}}})
+  **ID do Anúncio:** {{{adData.sourceId}}}
+
+  ---
+  💬 **MENSAGEM DO CLIENTE:**
+  {{{payload.body}}}
@@ -1,8 +1,28 @@
 # Russian translations for ChatWoot integration
 locale.name: '🇷🇺 Русский (Russian)'
-app.inbox.contact.name: 'WhatsApp Интеграция (WAHA)'
+
+# Базовый код локали - должен быть корректной локалью BCP 47
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA использует его для форматирования чисел, валют и даты/времени
+locale.base: 'ru-RU'
+
+app.inbox.contact.name: 'WhatsApp Интеграция'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'

+# "параметры" из date.toLocaleString
+# https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#options
+datetime:
+  locales: ru-RU
+  day: 2-digit
+  month: 2-digit
+  year: numeric
+  hour: 2-digit
+  minute: 2-digit
+  # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#timezonename
+  timeZoneName: shortGeneric
+  # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+  # timeZone: 'Europe/Moscow'
+
 job.report.error: |-
  ⚠️ **{{{header}}}**
  {{#attempts.nextDelay}}
@@ -216,7 +236,19 @@ whatsapp.to.chatwoot.message.location: |-
  {{#locationMessage}}
  📍 **Переданное местоположение**

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **Адрес:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **Сайт:** {{url}}
+  {{/url}}
+
+  🔗 **Открыть на карте:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/locationMessage}}

@@ -224,13 +256,127 @@ whatsapp.to.chatwoot.message.location: |-
  📍📡 **Делится геопозицией в реальном времени**
  Откройте **WhatsApp**, чтобы увидеть обновления в реальном времени.

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **Адрес:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **Сайт:** {{url}}
+  {{/url}}
+
+  🔗 **Открыть на карте:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/liveLocationMessage}}
  {{/message}}

+whatsapp.to.chatwoot.message.poll: |-
+  {{#poll}}
+  📊 **Опрос**
+
+  **{{name}}**
+  {{#options}}
+  - {{optionName}}
+  {{/options}}
+  {{/poll}}
+
+whatsapp.to.chatwoot.message.list: |-
+  {{#message.listMessage}}
+  {{#title}}
+  *{{{title}}}*
+  {{/title}}
+  {{#description}}
+  {{{description}}}
+  {{/description}}
+  {{#footerText}}
+  {{{footerText}}}
+  {{/footerText}}
+
+  {{#buttonText}}
+  {{{buttonText}}}
+  {{/buttonText}}
+  {{#sections}}
+  {{#title}}
+  {{{title}}}:
+  {{/title}}
+  {{#rows}}
+  {{#title}}
+  - {{{title}}}
+  {{/title}}
+  {{/rows}}
+
+  {{/sections}}
+  {{/message.listMessage}}
+
+whatsapp.to.chatwoot.message.event: |-
+  {{#message}}
+  {{#eventMessage}}
+  📅 **Событие**
+
+  **{{name}}**
+  {{#description}}
+  {{description}}
+  {{/description}}
+
+  {{#location.name}}
+  📍 **Место:** {{location.name}}
+  {{/location.name}}
+  {{#startTime}}
+  🕐 **Начало:** {{startTime}}
+  {{/startTime}}
+  {{#endTime}}
+  🕐 **Окончание:** {{endTime}}
+  {{/endTime}}
+  {{#joinLink}}
+  🔗 **Ссылка для участия:** [{{joinLink}}]({{joinLink}})
+  {{/joinLink}}
+  {{/eventMessage}}
+  {{/message}}
+
+whatsapp.to.chatwoot.message.pix: |-
+  💳 **PIX - Копировать и вставить**
+
+  {{#pixData}}
+  {{#merchantName}}
+  **{{merchantName}}**
+  {{/merchantName}}
+
+  {{#key}}
+  **Ключ PIX:** {{key}}
+  {{/key}}
+  {{#keyType}}
+  **Тип:** {{keyType}}
+  {{/keyType}}
+  {{#totalAmount}}
+  **Сумма:** {{totalAmountFormatted}}
+  {{/totalAmount}}
+  {{#referenceId}}
+  **Референс:** {{referenceId}}
+  {{/referenceId}}
+
+  💳 **PIX Копировать и вставить отправлен**
+  {{/pixData}}
+
 whatsapp.to.chatwoot.message.unsupported: |-
  ⚠️ **Этот тип сообщения не поддерживается в ChatWoot.**
  📱 Пожалуйста, откройте **WhatsApp**, чтобы просмотреть.

  Подробности: [{{{details.text}}}]({{{details.url}}})
+
+whatsapp.to.chatwoot.message.facebook.ad: |-
+  📢 **РЕКЛАМА FACEBOOK**
+
+  **Заголовок:** {{{adData.title}}}
+
+  **Описание:**
+  {{{adData.body}}}
+
+  **Ссылка на объявление:** [Посмотреть в Facebook]({{{adData.sourceUrl}}})
+  **Идентификатор объявления:** {{{adData.sourceId}}}
+
+  ---
+  💬 **Сообщение клиента:**
+  {{{payload.body}}}
@@ -1,8 +1,28 @@
 # Turkish translations for ChatWoot integration
 locale.name: '🇹🇷 Türkçe (Turkish)'
-app.inbox.contact.name: 'WhatsApp Entegrasyonu (WAHA)'
+
+# Temel yerel kodu - geçerli bir BCP 47 yerel kodu olmalı
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA bunu sayı, para birimi ve tarih/saat gösterimi için kullanır
+locale.base: 'tr-TR'
+
+app.inbox.contact.name: 'WhatsApp Entegrasyonu'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'

+# date.toLocaleString için "options"
+# https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#options
+datetime:
+  locales: tr-TR
+  day: 2-digit
+  month: 2-digit
+  year: numeric
+  hour: 2-digit
+  minute: 2-digit
+  # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#timezonename
+  timeZoneName: shortGeneric
+  # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+  # timeZone: 'Europe/Istanbul'
+
 job.report.error: |-
  ⚠️ **{{{header}}}**
  {{#attempts.nextDelay}}
@@ -216,7 +236,19 @@ whatsapp.to.chatwoot.message.location: |-
  {{#locationMessage}}
  📍 **Paylaşılan Konum**

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **Adres:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **Web sitesi:** {{url}}
+  {{/url}}
+
+  🔗 **Haritada görüntüle:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/locationMessage}}

@@ -224,13 +256,127 @@ whatsapp.to.chatwoot.message.location: |-
  📍📡 **Canlı Konum Paylaşılıyor**
  Gerçek zamanlı güncellemeleri görmek için **WhatsApp’ı** açın.

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **Adres:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **Web sitesi:** {{url}}
+  {{/url}}
+
+  🔗 **Haritada görüntüle:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/liveLocationMessage}}
  {{/message}}

+whatsapp.to.chatwoot.message.poll: |-
+  {{#poll}}
+  📊 **Anket**
+
+  **{{name}}**
+  {{#options}}
+  - {{optionName}}
+  {{/options}}
+  {{/poll}}
+
+whatsapp.to.chatwoot.message.list: |-
+  {{#message.listMessage}}
+  {{#title}}
+  *{{{title}}}*
+  {{/title}}
+  {{#description}}
+  {{{description}}}
+  {{/description}}
+  {{#footerText}}
+  {{{footerText}}}
+  {{/footerText}}
+
+  {{#buttonText}}
+  {{{buttonText}}}
+  {{/buttonText}}
+  {{#sections}}
+  {{#title}}
+  {{{title}}}:
+  {{/title}}
+  {{#rows}}
+  {{#title}}
+  - {{{title}}}
+  {{/title}}
+  {{/rows}}
+
+  {{/sections}}
+  {{/message.listMessage}}
+
+whatsapp.to.chatwoot.message.event: |-
+  {{#message}}
+  {{#eventMessage}}
+  📅 **Etkinlik**
+
+  **{{name}}**
+  {{#description}}
+  {{description}}
+  {{/description}}
+
+  {{#location.name}}
+  📍 **Konum:** {{location.name}}
+  {{/location.name}}
+  {{#startTime}}
+  🕐 **Başlangıç:** {{startTime}}
+  {{/startTime}}
+  {{#endTime}}
+  🕐 **Bitiş:** {{endTime}}
+  {{/endTime}}
+  {{#joinLink}}
+  🔗 **Katılma bağlantısı:** [{{joinLink}}]({{joinLink}})
+  {{/joinLink}}
+  {{/eventMessage}}
+  {{/message}}
+
+whatsapp.to.chatwoot.message.pix: |-
+  💳 **PIX - Kopyala ve Yapıştır**
+
+  {{#pixData}}
+  {{#merchantName}}
+  **{{merchantName}}**
+  {{/merchantName}}
+
+  {{#key}}
+  **PIX Anahtarı:** {{key}}
+  {{/key}}
+  {{#keyType}}
+  **Tür:** {{keyType}}
+  {{/keyType}}
+  {{#totalAmount}}
+  **Tutar:** {{totalAmountFormatted}}
+  {{/totalAmount}}
+  {{#referenceId}}
+  **Referans:** {{referenceId}}
+  {{/referenceId}}
+
+  💳 **PIX Kopyala ve Yapıştır gönderildi**
+  {{/pixData}}
+
 whatsapp.to.chatwoot.message.unsupported: |-
  ⚠️ **Bu mesaj türü ChatWoot’ta desteklenmiyor.**
  📱 Görüntülemek için lütfen **WhatsApp’ı** açın.

  Ayrıntılar: [{{{details.text}}}]({{{details.url}}})
+
+whatsapp.to.chatwoot.message.facebook.ad: |-
+  📢 **FACEBOOK İLANI**
+
+  **Başlık:** {{{adData.title}}}
+
+  **Açıklama:**
+  {{{adData.body}}}
+
+  **İlan Bağlantısı:** [Facebook’ta Görüntüle]({{{adData.sourceUrl}}})
+  **İlan Kimliği:** {{{adData.sourceId}}}
+
+  ---
+  💬 **Müşteri Mesajı:**
+  {{{payload.body}}}
@@ -1,8 +1,28 @@
 # Ukrainian translations for ChatWoot integration
 locale.name: '🇺🇦 Українська (Ukrainian)'
-app.inbox.contact.name: 'Інтеграція WhatsApp (WAHA)'
+
+# Базовий код локалі - має бути чинною локаллю BCP 47
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA використовує його для форматування чисел, валют і дати/часу
+locale.base: 'uk-UA'
+
+app.inbox.contact.name: 'Інтеграція WhatsApp'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'

+# "параметри" з date.toLocaleString
+# https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#options
+datetime:
+  locales: uk-UA
+  day: 2-digit
+  month: 2-digit
+  year: numeric
+  hour: 2-digit
+  minute: 2-digit
+  # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#timezonename
+  timeZoneName: shortGeneric
+  # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+  # timeZone: 'Europe/Kyiv'
+
 job.report.error: |-
  ⚠️ **{{{header}}}**
  {{#attempts.nextDelay}}
@@ -216,7 +236,19 @@ whatsapp.to.chatwoot.message.location: |-
  {{#locationMessage}}
  📍 **Надіслана локація**

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **Адреса:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **Вебсайт:** {{url}}
+  {{/url}}
+
+  🔗 **Переглянути на карті:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/locationMessage}}

@@ -224,13 +256,127 @@ whatsapp.to.chatwoot.message.location: |-
  📍📡 **Надсилання геолокації в реальному часі**
  Відкрийте **WhatsApp**, щоб побачити оновлення в реальному часі.

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **Адреса:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **Вебсайт:** {{url}}
+  {{/url}}
+
+  🔗 **Переглянути на карті:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/liveLocationMessage}}
  {{/message}}

+whatsapp.to.chatwoot.message.poll: |-
+  {{#poll}}
+  📊 **Опитування**
+
+  **{{name}}**
+  {{#options}}
+  - {{optionName}}
+  {{/options}}
+  {{/poll}}
+
+whatsapp.to.chatwoot.message.list: |-
+  {{#message.listMessage}}
+  {{#title}}
+  *{{{title}}}*
+  {{/title}}
+  {{#description}}
+  {{{description}}}
+  {{/description}}
+  {{#footerText}}
+  {{{footerText}}}
+  {{/footerText}}
+
+  {{#buttonText}}
+  {{{buttonText}}}
+  {{/buttonText}}
+  {{#sections}}
+  {{#title}}
+  {{{title}}}:
+  {{/title}}
+  {{#rows}}
+  {{#title}}
+  - {{{title}}}
+  {{/title}}
+  {{/rows}}
+
+  {{/sections}}
+  {{/message.listMessage}}
+
+whatsapp.to.chatwoot.message.event: |-
+  {{#message}}
+  {{#eventMessage}}
+  📅 **Подія**
+
+  **{{name}}**
+  {{#description}}
+  {{description}}
+  {{/description}}
+
+  {{#location.name}}
+  📍 **Місце:** {{location.name}}
+  {{/location.name}}
+  {{#startTime}}
+  🕐 **Початок:** {{startTime}}
+  {{/startTime}}
+  {{#endTime}}
+  🕐 **Завершення:** {{endTime}}
+  {{/endTime}}
+  {{#joinLink}}
+  🔗 **Посилання для приєднання:** [{{joinLink}}]({{joinLink}})
+  {{/joinLink}}
+  {{/eventMessage}}
+  {{/message}}
+
+whatsapp.to.chatwoot.message.pix: |-
+  💳 **PIX - Копіювати та Вставити**
+
+  {{#pixData}}
+  {{#merchantName}}
+  **{{merchantName}}**
+  {{/merchantName}}
+
+  {{#key}}
+  **Ключ PIX:** {{key}}
+  {{/key}}
+  {{#keyType}}
+  **Тип:** {{keyType}}
+  {{/keyType}}
+  {{#totalAmount}}
+  **Сума:** {{totalAmountFormatted}}
+  {{/totalAmount}}
+  {{#referenceId}}
+  **Референс:** {{referenceId}}
+  {{/referenceId}}
+
+  💳 **PIX Копіювати та Вставити надіслано**
+  {{/pixData}}
+
 whatsapp.to.chatwoot.message.unsupported: |-
  ⚠️ **Цей тип повідомлення не підтримується в ChatWoot.**
  📱 Будь ласка, відкрийте **WhatsApp**, щоб переглянути.

  Подробиці: [{{{details.text}}}]({{{details.url}}})
+
+whatsapp.to.chatwoot.message.facebook.ad: |-
+  📢 **РЕКЛАМА FACEBOOK**
+
+  **Заголовок:** {{{adData.title}}}
+
+  **Опис:**
+  {{{adData.body}}}
+
+  **Посилання на рекламу:** [Переглянути у Facebook]({{{adData.sourceUrl}}})
+  **Ідентифікатор реклами:** {{{adData.sourceId}}}
+
+  ---
+  💬 **Повідомлення клієнта:**
+  {{{payload.body}}}
@@ -1,8 +1,28 @@
 # Urdu translations for ChatWoot integration
 locale.name: '🇵🇰 اردو (Urdu)'
-app.inbox.contact.name: 'واٹس ایپ انٹیگریشن (WAHA)'
+
+# بنیادی لوکل کوڈ - یہ ایک معتبر BCP 47 لوکل ہونا چاہیے
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA اسے نمبرز، کرنسی اور تاریخ/وقت کی نمائندگی کے لیے استعمال کرتا ہے۔
+locale.base: 'ur-PK'
+
+app.inbox.contact.name: 'واٹس ایپ انٹیگریشن'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'

+# date.toLocaleString کی "options"
+# https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#options
+datetime:
+  locales: ur-PK
+  day: 2-digit
+  month: 2-digit
+  year: numeric
+  hour: 2-digit
+  minute: 2-digit
+  # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#timezonename
+  timeZoneName: shortGeneric
+  # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+  # timeZone: 'Asia/Karachi'
+
 job.report.error: |-
  ⚠️ **{{{header}}}**
  {{#attempts.nextDelay}}
@@ -216,7 +236,19 @@ whatsapp.to.chatwoot.message.location: |-
  {{#locationMessage}}
  📍 **شیئر کی گئی لوکیشن**

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **پتہ:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **ویب سائٹ:** {{url}}
+  {{/url}}
+
+  🔗 **نقشے پر دیکھیں:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/locationMessage}}

@@ -224,13 +256,127 @@ whatsapp.to.chatwoot.message.location: |-
  📍📡 **لائیو لوکیشن شیئر کی جا رہی ہے**
  حقیقی وقت کی تازہ کاریوں کے لیے **WhatsApp** کھولیں۔

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **پتہ:** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **ویب سائٹ:** {{url}}
+  {{/url}}
+
+  🔗 **نقشے پر دیکھیں:** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/liveLocationMessage}}
  {{/message}}

+whatsapp.to.chatwoot.message.poll: |-
+  {{#poll}}
+  📊 **رائے شماری**
+
+  **{{name}}**
+  {{#options}}
+  - {{optionName}}
+  {{/options}}
+  {{/poll}}
+
+whatsapp.to.chatwoot.message.list: |-
+  {{#message.listMessage}}
+  {{#title}}
+  *{{{title}}}*
+  {{/title}}
+  {{#description}}
+  {{{description}}}
+  {{/description}}
+  {{#footerText}}
+  {{{footerText}}}
+  {{/footerText}}
+
+  {{#buttonText}}
+  {{{buttonText}}}
+  {{/buttonText}}
+  {{#sections}}
+  {{#title}}
+  {{{title}}}:
+  {{/title}}
+  {{#rows}}
+  {{#title}}
+  - {{{title}}}
+  {{/title}}
+  {{/rows}}
+
+  {{/sections}}
+  {{/message.listMessage}}
+
+whatsapp.to.chatwoot.message.event: |-
+  {{#message}}
+  {{#eventMessage}}
+  📅 **ایونٹ**
+
+  **{{name}}**
+  {{#description}}
+  {{description}}
+  {{/description}}
+
+  {{#location.name}}
+  📍 **مقام:** {{location.name}}
+  {{/location.name}}
+  {{#startTime}}
+  🕐 **آغاز:** {{startTime}}
+  {{/startTime}}
+  {{#endTime}}
+  🕐 **اختتام:** {{endTime}}
+  {{/endTime}}
+  {{#joinLink}}
+  🔗 **شمولیت کا لنک:** [{{joinLink}}]({{joinLink}})
+  {{/joinLink}}
+  {{/eventMessage}}
+  {{/message}}
+
+whatsapp.to.chatwoot.message.pix: |-
+  💳 **PIX - کاپی اور پیسٹ**
+
+  {{#pixData}}
+  {{#merchantName}}
+  **{{merchantName}}**
+  {{/merchantName}}
+
+  {{#key}}
+  **PIX کلید:** {{key}}
+  {{/key}}
+  {{#keyType}}
+  **قسم:** {{keyType}}
+  {{/keyType}}
+  {{#totalAmount}}
+  **رقم:** {{totalAmountFormatted}}
+  {{/totalAmount}}
+  {{#referenceId}}
+  **حوالہ:** {{referenceId}}
+  {{/referenceId}}
+
+  💳 **PIX کاپی اور پیسٹ بھیج دیا گیا**
+  {{/pixData}}
+
 whatsapp.to.chatwoot.message.unsupported: |-
  ⚠️ **ChatWoot میں اس قسم کا پیغام معاونت یافتہ نہیں ہے۔**
  📱 اسے دیکھنے کے لیے براہ کرم **WhatsApp** کھولیں۔

  تفصیلات: [{{{details.text}}}]({{{details.url}}})
+
+whatsapp.to.chatwoot.message.facebook.ad: |-
+  📢 **فیس بک اشتہار**
+
+  **عنوان:** {{{adData.title}}}
+
+  **تفصیل:**
+  {{{adData.body}}}
+
+  **اشتہار کا لنک:** [فیس بک پر دیکھیں]({{{adData.sourceUrl}}})
+  **اشتہار کا شناختی نمبر:** {{{adData.sourceId}}}
+
+  ---
+  💬 **گاہک کا پیغام:**
+  {{{payload.body}}}
@@ -1,8 +1,28 @@
 # Simplified Chinese translations for ChatWoot integration
 locale.name: '🇨🇳 中文（Simplified Chinese）'
+
+# 基础语言代码 - 必须是有效的 BCP 47 语言区域
+# https://en.wikipedia.org/wiki/IETF_language_tag
+# WAHA 使用它来格式化数字、货币和日期时间。
+locale.base: 'zh-CN'
+
 app.inbox.contact.name: 'WhatsApp 集成（WAHA）'
 app.inbox.contact.avatar.url: 'https://raw.githubusercontent.com/devlikeapro/waha/core/logo.png'

+# date.toLocaleString 的 "options"
+# https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#options
+datetime:
+  locales: zh-CN
+  day: 2-digit
+  month: 2-digit
+  year: numeric
+  hour: 2-digit
+  minute: 2-digit
+  # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat#timezonename
+  timeZoneName: shortGeneric
+  # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+  # timeZone: 'Asia/Shanghai'
+
 job.report.error: |-
  ⚠️ **{{{header}}}**
  {{#attempts.nextDelay}}
@@ -218,7 +238,19 @@ whatsapp.to.chatwoot.message.location: |-
  {{#locationMessage}}
  📍 **共享位置**

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **地址：** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **网站：** {{url}}
+  {{/url}}
+
+  🔗 **在地图上查看：** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/locationMessage}}

@@ -226,13 +258,127 @@ whatsapp.to.chatwoot.message.location: |-
  📍📡 **正在共享实时位置**
  打开 **WhatsApp** 查看实时更新。

-  https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
+  {{#name}}
+  **{{name}}**
+  {{/name}}
+
+  {{#address}}
+  📍 **地址：** {{address}}
+  {{/address}}
+
+  {{#url}}
+  🌐 **网站：** {{url}}
+  {{/url}}
+
+  🔗 **在地图上查看：** https://www.google.com/maps?q={{degreesLatitude}},{{degreesLongitude}}
  {{#caption}}{{caption}}{{/caption}}
  {{/liveLocationMessage}}
  {{/message}}

+whatsapp.to.chatwoot.message.poll: |-
+  {{#poll}}
+  📊 **投票**
+
+  **{{name}}**
+  {{#options}}
+  - {{optionName}}
+  {{/options}}
+  {{/poll}}
+
+whatsapp.to.chatwoot.message.list: |-
+  {{#message.listMessage}}
+  {{#title}}
+  *{{{title}}}*
+  {{/title}}
+  {{#description}}
+  {{{description}}}
+  {{/description}}
+  {{#footerText}}
+  {{{footerText}}}
+  {{/footerText}}
+
+  {{#buttonText}}
+  {{{buttonText}}}
+  {{/buttonText}}
+  {{#sections}}
+  {{#title}}
+  {{{title}}}:
+  {{/title}}
+  {{#rows}}
+  {{#title}}
+  - {{{title}}}
+  {{/title}}
+  {{/rows}}
+
+  {{/sections}}
+  {{/message.listMessage}}
+
+whatsapp.to.chatwoot.message.event: |-
+  {{#message}}
+  {{#eventMessage}}
+  📅 **活动**
+
+  **{{name}}**
+  {{#description}}
+  {{description}}
+  {{/description}}
+
+  {{#location.name}}
+  📍 **地点：** {{location.name}}
+  {{/location.name}}
+  {{#startTime}}
+  🕐 **开始时间：** {{startTime}}
+  {{/startTime}}
+  {{#endTime}}
+  🕐 **结束时间：** {{endTime}}
+  {{/endTime}}
+  {{#joinLink}}
+  🔗 **加入链接：** [{{joinLink}}]({{joinLink}})
+  {{/joinLink}}
+  {{/eventMessage}}
+  {{/message}}
+
+whatsapp.to.chatwoot.message.pix: |-
+  💳 **PIX - 复制粘贴**
+
+  {{#pixData}}
+  {{#merchantName}}
+  **{{merchantName}}**
+  {{/merchantName}}
+
+  {{#key}}
+  **PIX 密钥：** {{key}}
+  {{/key}}
+  {{#keyType}}
+  **类型：** {{keyType}}
+  {{/keyType}}
+  {{#totalAmount}}
+  **金额：** {{totalAmountFormatted}}
+  {{/totalAmount}}
+  {{#referenceId}}
+  **参考：** {{referenceId}}
+  {{/referenceId}}
+
+  💳 **PIX 复制粘贴已发送**
+  {{/pixData}}
+
 whatsapp.to.chatwoot.message.unsupported: |-
  ⚠️ **ChatWoot 不支持此消息类型。**
  📱 请打开 **WhatsApp** 查看。

  详情: [{{{details.text}}}]({{{details.url}}})
+
+whatsapp.to.chatwoot.message.facebook.ad: |-
+  📢 **Facebook 广告**
+
+  **标题:** {{{adData.title}}}
+
+  **描述:**
+  {{{adData.body}}}
+
+  **广告链接:** [在 Facebook 查看]({{{adData.sourceUrl}}})
+  **广告 ID:** {{{adData.sourceId}}}
+
+  ---
+  💬 **客户消息:**
+  {{{payload.body}}}
@@ -51,7 +51,12 @@ export enum TKey {
  WA_TO_CW_MESSAGE = 'whatsapp.to.chatwoot.message',
  WA_TO_CW_MESSAGE_CONTACTS = 'whatsapp.to.chatwoot.message.contacts',
  WA_TO_CW_MESSAGE_LOCATION = 'whatsapp.to.chatwoot.message.location',
+  WA_TO_CW_MESSAGE_POLL = 'whatsapp.to.chatwoot.message.poll',
+  WA_TO_CW_MESSAGE_EVENT = 'whatsapp.to.chatwoot.message.event',
+  WA_TO_CW_MESSAGE_PIX = 'whatsapp.to.chatwoot.message.pix',
  WA_TO_CW_MESSAGE_UNSUPPORTED = 'whatsapp.to.chatwoot.message.unsupported',
+  WA_TO_CW_MESSAGE_FACEBOOK_AD = 'whatsapp.to.chatwoot.message.facebook.ad',
+  WA_TO_CW_MESSAGE_LIST = 'whatsapp.to.chatwoot.message.list',

  //
  // App Inbox
@@ -99,6 +104,34 @@ interface Link {
  url: string;
 }

+export interface FacebookAdTemplateData {
+  title: string;
+  body: string;
+  thumbnailUrl: string;
+  originalImageUrl: string;
+  sourceUrl: string;
+  sourceId: string;
+}
+
+export interface PollOption {
+  optionName?: string;
+}
+
+export interface PollCreationMessage {
+  name?: string;
+  options?: Array<PollOption>;
+}
+
+export interface PixTemplatePayload {
+  merchantName?: string;
+  key?: string;
+  keyType?: string;
+  currency?: string;
+  totalAmount?: number;
+  totalAmountFormatted?: string;
+  referenceId?: string;
+}
+
 export type TemplatePayloads = {
  [TKey.LOCALE_NAME]: void;
  [TKey.APP_INBOX_CONTACT_NAME]: void;
@@ -131,7 +164,31 @@ export type TemplatePayloads = {
  };
  [TKey.WA_TO_CW_MESSAGE_CONTACTS]: { contacts: SimpleVCardInfo[] };
  [TKey.WA_TO_CW_MESSAGE_LOCATION]: { payload: any; message: proto.Message };
+  [TKey.WA_TO_CW_MESSAGE_POLL]: {
+    payload: WAMessage;
+    poll: PollCreationMessage;
+    message: proto.Message;
+  };
+  [TKey.WA_TO_CW_MESSAGE_EVENT]: {
+    payload: WAMessage;
+    message: {
+      eventMessage: Record<string, unknown>;
+    };
+  };
+  [TKey.WA_TO_CW_MESSAGE_LIST]: {
+    payload: WAMessage;
+    message: proto.Message;
+  };
+  [TKey.WA_TO_CW_MESSAGE_PIX]: {
+    payload: WAMessage;
+    message: proto.Message | null;
+    pixData: PixTemplatePayload;
+  };
  [TKey.WA_TO_CW_MESSAGE_UNSUPPORTED]: { details: Link };
+  [TKey.WA_TO_CW_MESSAGE_FACEBOOK_AD]: {
+    payload: WAMessage;
+    adData: FacebookAdTemplateData;
+  };
  [TKey.JOB_SCHEDULED_ERROR_HEADER]: void;
  [TKey.JOB_REPORT_ERROR]: {
    header: string;
@@ -0,0 +1,45 @@
+import { ChatWootMessagePartial } from '@waha/apps/chatwoot/consumers/waha/base';
+import { Locale } from '@waha/apps/chatwoot/i18n/locale';
+import { TKey } from '@waha/apps/chatwoot/i18n/templates';
+import { MessageToChatWootConverter } from '@waha/apps/chatwoot/messages/to/chatwoot';
+import { isEmptyString } from '@waha/apps/chatwoot/messages/to/chatwoot/utils/proto';
+import { WhatsappToMarkdown } from '@waha/apps/chatwoot/messages/to/chatwoot/utils/markdown';
+import type { proto } from '@adiwajshing/baileys';
+import { WAMessage } from '@waha/structures/responses.dto';
+
+export class EventMessage implements MessageToChatWootConverter {
+  constructor(private readonly l: Locale) {}
+
+  convert(
+    payload: WAMessage,
+    protoMessage: proto.Message | null,
+  ): ChatWootMessagePartial | null {
+    const eventMessage = protoMessage?.eventMessage;
+    if (!eventMessage) {
+      return null;
+    }
+
+    const formattedEventMessage = {
+      ...eventMessage,
+      startTime: this.l.FormatTimestamp(eventMessage.startTime),
+      endTime: this.l.FormatTimestamp(eventMessage.endTime),
+    };
+
+    const content = this.l.key(TKey.WA_TO_CW_MESSAGE_EVENT).r({
+      payload,
+      message: {
+        eventMessage: formattedEventMessage,
+      },
+    });
+
+    if (isEmptyString(content)) {
+      return null;
+    }
+
+    return {
+      content: WhatsappToMarkdown(content),
+      attachments: [],
+      private: undefined,
+    };
+  }
+}
@@ -0,0 +1,91 @@
+import { ILogger } from '@waha/apps/app_sdk/ILogger';
+import { SendAttachment } from '@waha/apps/chatwoot/client/types';
+import { ChatWootMessagePartial } from '@waha/apps/chatwoot/consumers/waha/base';
+import { Locale } from '@waha/apps/chatwoot/i18n/locale';
+import {
+  FacebookAdTemplateData,
+  TKey,
+} from '@waha/apps/chatwoot/i18n/templates';
+import { MessageToChatWootConverter } from '@waha/apps/chatwoot/messages/to/chatwoot';
+import { WhatsappToMarkdown } from '@waha/apps/chatwoot/messages/to/chatwoot/utils/markdown';
+import { WAMessage } from '@waha/structures/responses.dto';
+import type { proto } from '@adiwajshing/baileys';
+import * as lodash from 'lodash';
+import { fetchBuffer } from '@waha/core/abc/session.abc';
+
+export class FacebookAdMessage implements MessageToChatWootConverter {
+  constructor(
+    private readonly locale: Locale,
+    private readonly logger: ILogger,
+  ) {}
+
+  async convert(
+    payload: WAMessage,
+    protoMessage: proto.Message | null,
+  ): Promise<ChatWootMessagePartial | null> {
+    const adData = this.extractAdData(protoMessage);
+    if (!adData) {
+      return null;
+    }
+    const content = this.locale.key(TKey.WA_TO_CW_MESSAGE_FACEBOOK_AD).render({
+      payload,
+      adData,
+    });
+    const attachments = await this.getAttachments(adData);
+
+    return {
+      content: WhatsappToMarkdown(content),
+      attachments,
+      private: undefined,
+    };
+  }
+
+  private extractAdData(protoMessage: proto.Message): FacebookAdTemplateData {
+    if (
+      lodash.isEmpty(
+        protoMessage?.extendedTextMessage?.contextInfo?.externalAdReply,
+      )
+    ) {
+      return null;
+    }
+    const adReply =
+      protoMessage?.extendedTextMessage?.contextInfo?.externalAdReply;
+    return {
+      title: adReply.title ?? '',
+      body: adReply.body ?? '',
+      thumbnailUrl: adReply.thumbnailUrl ?? '',
+      originalImageUrl: adReply.originalImageUrl ?? '',
+      sourceUrl: adReply.sourceUrl ?? '',
+      sourceId: adReply.sourceId ?? '',
+    };
+  }
+
+  private async getAttachments(
+    adData: FacebookAdTemplateData,
+  ): Promise<SendAttachment[]> {
+    const imageUrl = adData.originalImageUrl || adData.thumbnailUrl;
+    if (!imageUrl) {
+      return [];
+    }
+
+    try {
+      this.logger.info(`Downloading Facebook Ad image from '${imageUrl}'...`);
+      const buffer = await fetchBuffer(imageUrl);
+      const attachment: SendAttachment = {
+        content: buffer.toString('base64'),
+        filename: 'facebook-ad-image.jpg',
+        encoding: 'base64',
+      };
+      this.logger.info(
+        `Downloaded Facebook Ad image from '${imageUrl}' as '${attachment.filename}'`,
+      );
+      return [attachment];
+    } catch (error) {
+      const reason = error instanceof Error ? error.message : `${error}`;
+      this.logger.error(
+        `Failed to download Facebook Ad image from '${imageUrl}': ${reason}`,
+      );
+      return [];
+    }
+  }
+}
@@ -0,0 +1,37 @@
+import { ChatWootMessagePartial } from '@waha/apps/chatwoot/consumers/waha/base';
+import { Locale } from '@waha/apps/chatwoot/i18n/locale';
+import { TKey } from '@waha/apps/chatwoot/i18n/templates';
+import { MessageToChatWootConverter } from '@waha/apps/chatwoot/messages/to/chatwoot';
+import { isEmptyString } from '@waha/apps/chatwoot/messages/to/chatwoot/utils/proto';
+import { WhatsappToMarkdown } from '@waha/apps/chatwoot/messages/to/chatwoot/utils/markdown';
+import * as lodash from 'lodash';
+import type { proto } from '@adiwajshing/baileys';
+import { WAMessage } from '@waha/structures/responses.dto';
+
+export class ListMessage implements MessageToChatWootConverter {
+  constructor(private readonly locale: Locale) {}
+
+  convert(
+    payload: WAMessage,
+    protoMessage: proto.Message | null,
+  ): ChatWootMessagePartial | null {
+    const listMessage = protoMessage?.listMessage;
+    if (lodash.isEmpty(listMessage)) {
+      return null;
+    }
+
+    const content = this.locale
+      .key(TKey.WA_TO_CW_MESSAGE_LIST)
+      .r({ payload, message: protoMessage as proto.Message });
+
+    if (isEmptyString(content)) {
+      return null;
+    }
+
+    return {
+      content: WhatsappToMarkdown(content),
+      attachments: [],
+      private: undefined,
+    };
+  }
+}
@@ -0,0 +1,37 @@
+import { Locale } from '@waha/apps/chatwoot/i18n/locale';
+import { TKey } from '@waha/apps/chatwoot/i18n/templates';
+import { ChatWootMessagePartial } from '@waha/apps/chatwoot/consumers/waha/base';
+import { isEmptyString } from './utils/proto';
+import * as lodash from 'lodash';
+import type { proto } from '@adiwajshing/baileys';
+import { WAMessage } from '@waha/structures/responses.dto';
+import { MessageToChatWootConverter } from '@waha/apps/chatwoot/messages/to/chatwoot';
+
+export class LocationMessage implements MessageToChatWootConverter {
+  constructor(private readonly locale: Locale) {}
+
+  convert(
+    payload: WAMessage,
+    protoMessage: proto.Message | null,
+  ): ChatWootMessagePartial | null {
+    const hasLocation = !lodash.isEmpty(protoMessage?.locationMessage);
+    const hasLiveLocation = !lodash.isEmpty(protoMessage?.liveLocationMessage);
+    if (!hasLocation && !hasLiveLocation) {
+      return null;
+    }
+
+    const content = this.locale
+      .key(TKey.WA_TO_CW_MESSAGE_LOCATION)
+      .r({ payload, message: protoMessage });
+
+    if (isEmptyString(content)) {
+      return null;
+    }
+
+    return {
+      content,
+      attachments: [],
+      private: undefined,
+    };
+  }
+}
@@ -0,0 +1,28 @@
+import { ChatWootMessagePartial } from '@waha/apps/chatwoot/consumers/waha/base';
+import { Locale } from '@waha/apps/chatwoot/i18n/locale';
+import { TKey } from '@waha/apps/chatwoot/i18n/templates';
+import { MessageToChatWootConverter } from '@waha/apps/chatwoot/messages/to/chatwoot';
+import { WAMessage } from '@waha/structures/responses.dto';
+import type { proto } from '@adiwajshing/baileys';
+import { WhatsappToMarkdown } from '@waha/apps/chatwoot/messages/to/chatwoot/utils/markdown';
+
+export class MessageEdited implements MessageToChatWootConverter {
+  constructor(private readonly locale: Locale) {}
+
+  convert(
+    payload: WAMessage,
+    protoMessage: proto.Message | null,
+  ): ChatWootMessagePartial | null {
+    void protoMessage;
+    const formatted = WhatsappToMarkdown(payload.body);
+    const content = this.locale
+      .key(TKey.MESSAGE_EDITED_IN_WHATSAPP)
+      .render({ text: formatted });
+
+    return {
+      content,
+      attachments: [],
+      private: undefined,
+    };
+  }
+}
@@ -0,0 +1,250 @@
+import { PixMessage } from '@waha/apps/chatwoot/messages/to/chatwoot/PixMessage';
+import { resolveProtoMessage } from '@waha/apps/chatwoot/messages/to/chatwoot';
+import { WAMessage } from '@waha/structures/responses.dto';
+import { JestLogger } from '@waha/apps/app_sdk/jest/JestLogger';
+import { i18n } from '@waha/apps/chatwoot/i18n';
+
+describe('PixMessage - pt-BR', () => {
+  const locale = i18n.locale('pt-BR');
+
+  it('GOWS - no total amount', () => {
+    // Setup
+    const buttonParamsJson = JSON.stringify({
+      currency: 'BRL',
+      total_amount: {
+        value: 0,
+        offset: 100,
+      },
+      reference_id: '4TB11111111',
+      type: 'physical-goods',
+      order: {
+        status: 'pending',
+        subtotal: {
+          value: 0,
+          offset: 100,
+        },
+        order_type: 'ORDER',
+        items: [
+          {
+            name: '',
+            amount: {
+              value: 0,
+              offset: 100,
+            },
+            quantity: 0,
+            sale_amount: {
+              value: 0,
+              offset: 100,
+            },
+          },
+        ],
+      },
+      payment_settings: [
+        {
+          type: 'pix_static_code',
+          pix_static_code: {
+            merchant_name: 'Merchant Name Here',
+            key: '+5000000000000',
+            key_type: 'PHONE',
+          },
+        },
+      ],
+      share_payment_status: false,
+      referral: 'chat_attachment',
+    });
+
+    const payload = {
+      id: 'false_559900000001@c.us_FAKEPIXORDER1',
+      timestamp: 1899003201,
+      from: '559900000001@c.us',
+      fromMe: false,
+      source: 'app',
+      to: null,
+      participant: null,
+      hasMedia: false,
+      ack: 2,
+      ackName: 'DEVICE',
+      body: '',
+      _data: {
+        Message: {
+          messageContextInfo: {
+            deviceListMetadata: {
+              senderKeyHash: 'aFakeSenderKeyHash==',
+              senderTimestamp: 1880001234,
+              recipientKeyHash: 'anotherFakeRecipientKeyHash==',
+              recipientTimestamp: 1880005678,
+            },
+            deviceListMetadataVersion: 2,
+            messageSecret: 'fakeMessageSecret==',
+          },
+          interactiveMessage: {
+            InteractiveMessage: {
+              NativeFlowMessage: {
+                buttons: [
+                  {
+                    name: 'payment_info',
+                    buttonParamsJSON: buttonParamsJson,
+                  },
+                ],
+              },
+            },
+          },
+          contextInfo: {
+            expiration: 0,
+            ephemeralSettingTimestamp: 1880006789,
+            disappearingMode: {
+              initiator: 0,
+              trigger: 0,
+            },
+          },
+        },
+      },
+    } as unknown as WAMessage;
+
+    // Test
+    const logger = JestLogger();
+    const protoMessage = resolveProtoMessage(payload);
+    const converter = new PixMessage(locale, logger);
+    const result = converter.convert(payload, protoMessage);
+
+    // Assert
+    const expected = `💳 ****PIX - Copia e Cola****
+
+****Merchant Name Here****
+
+****Chave PIX:**** +5000000000000
+****Tipo:**** PHONE
+****Referência:**** 4TB11111111
+
+💳 ****PIX Copia e Cola enviado****
+`;
+
+    expect(protoMessage).not.toBeNull();
+    expect(result).not.toBeNull();
+    expect(result.content).toEqual(expected);
+    expect(logger.fatal).not.toHaveBeenCalled();
+    expect(logger.error).not.toHaveBeenCalled();
+    expect(logger.warn).not.toHaveBeenCalled();
+  });
+
+  it('GOWS - with total amount', () => {
+    // Setup
+    const buttonParamsJson = JSON.stringify({
+      currency: 'BRL',
+      total_amount: {
+        value: 2512,
+        offset: 100,
+      },
+      reference_id: '4TB11111111',
+      type: 'physical-goods',
+      order: {
+        status: 'pending',
+        subtotal: {
+          value: 2512,
+          offset: 100,
+        },
+        order_type: 'ORDER',
+        items: [
+          {
+            name: '',
+            amount: {
+              value: 2512,
+              offset: 100,
+            },
+            quantity: 1,
+            sale_amount: {
+              value: 2512,
+              offset: 100,
+            },
+          },
+        ],
+      },
+      payment_settings: [
+        {
+          type: 'pix_static_code',
+          pix_static_code: {
+            merchant_name: 'Merchant Name Here',
+            key: '+5000000000000',
+            key_type: 'PHONE',
+          },
+        },
+      ],
+      share_payment_status: false,
+      referral: 'chat_attachment',
+    });
+
+    const payload = {
+      id: 'false_559900000001@c.us_FAKEPIXORDER1',
+      timestamp: 1899003201,
+      from: '559900000001@c.us',
+      fromMe: false,
+      source: 'app',
+      to: null,
+      participant: null,
+      hasMedia: false,
+      ack: 2,
+      ackName: 'DEVICE',
+      body: '',
+      _data: {
+        Message: {
+          messageContextInfo: {
+            deviceListMetadata: {
+              senderKeyHash: 'aFakeSenderKeyHash==',
+              senderTimestamp: 1880001234,
+              recipientKeyHash: 'anotherFakeRecipientKeyHash==',
+              recipientTimestamp: 1880005678,
+            },
+            deviceListMetadataVersion: 2,
+            messageSecret: 'fakeMessageSecret==',
+          },
+          interactiveMessage: {
+            InteractiveMessage: {
+              NativeFlowMessage: {
+                buttons: [
+                  {
+                    name: 'payment_info',
+                    buttonParamsJSON: buttonParamsJson,
+                  },
+                ],
+              },
+            },
+          },
+          contextInfo: {
+            expiration: 0,
+            ephemeralSettingTimestamp: 1880006789,
+            disappearingMode: {
+              initiator: 0,
+              trigger: 0,
+            },
+          },
+        },
+      },
+    } as unknown as WAMessage;
+
+    // Test
+    const logger = JestLogger();
+    const protoMessage = resolveProtoMessage(payload);
+    const converter = new PixMessage(locale, logger);
+    const result = converter.convert(payload, protoMessage);
+
+    // Assert
+    const expected = `💳 ****PIX - Copia e Cola****
+
+****Merchant Name Here****
+
+****Chave PIX:**** +5000000000000
+****Tipo:**** PHONE
+****Valor:**** R$\u00A025,12
+****Referência:**** 4TB11111111
+
+💳 ****PIX Copia e Cola enviado****
+`;
+
+    expect(protoMessage).not.toBeNull();
+    expect(result).not.toBeNull();
+    expect(result.content).toEqual(expected);
+    expect(logger.fatal).not.toHaveBeenCalled();
+    expect(logger.error).not.toHaveBeenCalled();
+    expect(logger.warn).not.toHaveBeenCalled();
+  });
+});
@@ -0,0 +1,124 @@
+import { ILogger } from '@waha/apps/app_sdk/ILogger';
+import { ChatWootMessagePartial } from '@waha/apps/chatwoot/consumers/waha/base';
+import { Locale } from '@waha/apps/chatwoot/i18n/locale';
+import { PixTemplatePayload, TKey } from '@waha/apps/chatwoot/i18n/templates';
+import { MessageToChatWootConverter } from '@waha/apps/chatwoot/messages/to/chatwoot';
+import { isEmptyString } from '@waha/apps/chatwoot/messages/to/chatwoot/utils/proto';
+import { WhatsappToMarkdown } from '@waha/apps/chatwoot/messages/to/chatwoot/utils/markdown';
+import * as lodash from 'lodash';
+import type { proto } from '@adiwajshing/baileys';
+import { WAMessage } from '@waha/structures/responses.dto';
+
+export class PixMessage implements MessageToChatWootConverter {
+  constructor(
+    private readonly l: Locale,
+    private readonly logger: ILogger,
+  ) {}
+
+  convert(
+    payload: WAMessage,
+    protoMessage: proto.Message | null,
+  ): ChatWootMessagePartial | null {
+    if (!protoMessage) {
+      return null;
+    }
+    const pixData = this.extractPixData(protoMessage);
+    if (!pixData) {
+      return null;
+    }
+
+    const content = this.l.key(TKey.WA_TO_CW_MESSAGE_PIX).r({
+      payload: payload,
+      message: protoMessage,
+      pixData: pixData,
+    });
+
+    if (isEmptyString(content)) {
+      return null;
+    }
+
+    return {
+      content: WhatsappToMarkdown(content),
+      attachments: [],
+      private: undefined,
+    };
+  }
+
+  private extractPixData(
+    protoMessage: proto.Message,
+  ): PixTemplatePayload | null {
+    const buttons = this.resolveNativeFlowButtons(protoMessage);
+    if (!buttons || buttons.length === 0) {
+      return null;
+    }
+
+    const paymentButton = buttons.find(
+      (button) => button?.name === 'payment_info' && button?.buttonParamsJson,
+    );
+
+    if (!paymentButton?.buttonParamsJson) {
+      return null;
+    }
+
+    let params: any;
+    try {
+      params = JSON.parse(paymentButton.buttonParamsJson);
+    } catch (error) {
+      this.logger.warn(`Failed to parse PIX button params: ${error}`);
+      return null;
+    }
+
+    const pixSettings = params?.payment_settings?.find(
+      (setting: any) => setting?.type === 'pix_static_code',
+    );
+    const pixCode = pixSettings?.pix_static_code;
+    if (!pixCode) {
+      return null;
+    }
+
+    const totalAmountFormatted = this.l.FormatCurrency(
+      params?.currency,
+      params?.total_amount?.value,
+      params?.total_amount?.offset,
+    );
+    const data: PixTemplatePayload = {
+      merchantName: pixCode.merchant_name,
+      key: pixCode.key,
+      keyType: pixCode.key_type,
+      currency: params?.currency,
+      totalAmount: params?.total_amount?.value,
+      totalAmountFormatted: totalAmountFormatted,
+      referenceId: params?.reference_id,
+    };
+
+    if (lodash.isEmpty(data)) {
+      return null;
+    }
+    return data;
+  }
+
+  private resolveNativeFlowButtons(
+    protoMessage: proto.Message,
+  ):
+    | proto.Message.InteractiveMessage.NativeFlowMessage.INativeFlowButton[]
+    | null {
+    let interactiveMessage: proto.Message.IInteractiveMessage =
+      protoMessage?.interactiveMessage;
+    if (lodash.isEmpty(interactiveMessage)) {
+      return null;
+    }
+    // GOWS has weird oneOf protobuf behaviour,
+    // so we need to double interactiveMessage
+    if (
+      !lodash.isEmpty(
+        (interactiveMessage as proto.Message.InteractiveMessage)
+          .interactiveMessage,
+      )
+    ) {
+      interactiveMessage = (
+        interactiveMessage as proto.Message.InteractiveMessage
+      ).interactiveMessage as proto.Message.IInteractiveMessage;
+    }
+    return interactiveMessage?.nativeFlowMessage?.buttons;
+  }
+}
@@ -0,0 +1,46 @@
+import { ChatWootMessagePartial } from '@waha/apps/chatwoot/consumers/waha/base';
+import { Locale } from '@waha/apps/chatwoot/i18n/locale';
+import { PollCreationMessage, TKey } from '@waha/apps/chatwoot/i18n/templates';
+import { MessageToChatWootConverter } from '@waha/apps/chatwoot/messages/to/chatwoot';
+import { isEmptyString } from '@waha/apps/chatwoot/messages/to/chatwoot/utils/proto';
+import { WhatsappToMarkdown } from '@waha/apps/chatwoot/messages/to/chatwoot/utils/markdown';
+import type { proto } from '@adiwajshing/baileys';
+import { WAMessage } from '@waha/structures/responses.dto';
+import * as lodash from 'lodash';
+
+export class PollMessage implements MessageToChatWootConverter {
+  constructor(private readonly locale: Locale) {}
+
+  convert(
+    payload: WAMessage,
+    protoMessage: proto.Message | null,
+  ): ChatWootMessagePartial | null {
+    let poll: PollCreationMessage = null;
+    if (!lodash.isEmpty(protoMessage?.pollCreationMessage)) {
+      poll = protoMessage.pollCreationMessage;
+    }
+    if (!lodash.isEmpty(protoMessage?.pollCreationMessageV2)) {
+      poll = protoMessage.pollCreationMessageV2;
+    }
+    if (!lodash.isEmpty(protoMessage?.pollCreationMessageV3)) {
+      poll = protoMessage.pollCreationMessageV3;
+    }
+    if (!poll) {
+      return null;
+    }
+
+    const content = this.locale
+      .key(TKey.WA_TO_CW_MESSAGE_POLL)
+      .r({ payload: payload, poll: poll, message: protoMessage });
+
+    if (isEmptyString(content)) {
+      return null;
+    }
+
+    return {
+      content: WhatsappToMarkdown(content),
+      attachments: [],
+      private: undefined,
+    };
+  }
+}
@@ -0,0 +1,70 @@
+import { ILogger } from '@waha/apps/app_sdk/ILogger';
+import { SendAttachment } from '@waha/apps/chatwoot/client/types';
+import { ChatWootMessagePartial } from '@waha/apps/chatwoot/consumers/waha/base';
+import { Locale } from '@waha/apps/chatwoot/i18n/locale';
+import { TKey } from '@waha/apps/chatwoot/i18n/templates';
+import { parseVCardV3, SimpleVCardInfo } from '@waha/core/vcard';
+import * as lodash from 'lodash';
+import type { proto } from '@adiwajshing/baileys';
+import { WAMessage } from '@waha/structures/responses.dto';
+import { MessageToChatWootConverter } from '@waha/apps/chatwoot/messages/to/chatwoot';
+
+export class ShareContactMessage implements MessageToChatWootConverter {
+  constructor(
+    private readonly locale: Locale,
+    private readonly logger: ILogger,
+  ) {}
+
+  convert(
+    payload: WAMessage,
+    protoMessage: proto.Message | null,
+  ): ChatWootMessagePartial | null {
+    void payload;
+    const vcards = collectVcards(protoMessage);
+    if (vcards.length === 0) {
+      return null;
+    }
+
+    const attachments: SendAttachment[] = vcards.map((vcard, index) => ({
+      content: Buffer.from(vcard, 'utf8').toString('base64'),
+      encoding: 'base64',
+      filename: `vcard-${index + 1}.vcf`,
+    }));
+
+    let contacts: SimpleVCardInfo[] = [];
+    try {
+      contacts = vcards.map(parseVCardV3);
+    } catch (err) {
+      this.logger.error(
+        `Error parsing some vcards: vcards=${vcards}, err=${err}`,
+      );
+    }
+
+    if (contacts.length === 0 && attachments.length === 0) {
+      return null;
+    }
+
+    const content = this.locale
+      .key(TKey.WA_TO_CW_MESSAGE_CONTACTS)
+      .r({ contacts });
+
+    return {
+      content,
+      attachments,
+      private: undefined,
+    };
+  }
+}
+
+function collectVcards(message: proto.Message | null): string[] {
+  if (lodash.isEmpty(message?.contactsArrayMessage?.contacts)) {
+    if (!lodash.isEmpty(message?.contactMessage?.vcard)) {
+      return [message!.contactMessage!.vcard];
+    }
+    return [];
+  }
+
+  return message!.contactsArrayMessage!.contacts.map(
+    (contact) => contact.vcard,
+  );
+}
@@ -0,0 +1,67 @@
+import { ILogger } from '@waha/apps/app_sdk/ILogger';
+import { SendAttachment } from '@waha/apps/chatwoot/client/types';
+import { ChatWootMessagePartial } from '@waha/apps/chatwoot/consumers/waha/base';
+import { Locale } from '@waha/apps/chatwoot/i18n/locale';
+import { TKey } from '@waha/apps/chatwoot/i18n/templates';
+import { WAHASelf } from '@waha/apps/chatwoot/session/WAHASelf';
+import { isEmptyString } from './utils/proto';
+import type { proto } from '@adiwajshing/baileys';
+import { WAMessage } from '@waha/structures/responses.dto';
+import { MessageToChatWootConverter } from '@waha/apps/chatwoot/messages/to/chatwoot';
+import { WhatsappToMarkdown } from '@waha/apps/chatwoot/messages/to/chatwoot/utils/markdown';
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const mime = require('mime-types');
+
+export class TextMessage implements MessageToChatWootConverter {
+  constructor(
+    private readonly locale: Locale,
+    private readonly logger: ILogger,
+    private readonly waha: WAHASelf,
+  ) {}
+
+  async convert(
+    payload: WAMessage,
+    protoMessage: proto.Message | null,
+  ): Promise<ChatWootMessagePartial | null> {
+    void protoMessage;
+    const attachments = await this.getAttachments(payload);
+    let content = this.locale.key(TKey.WA_TO_CW_MESSAGE).render({ payload });
+    if (isEmptyString(content) && attachments.length === 0) {
+      return null;
+    }
+    if (isEmptyString(content)) {
+      content = null;
+    }
+    return {
+      content: WhatsappToMarkdown(content),
+      attachments,
+      private: undefined,
+    };
+  }
+
+  private async getAttachments(payload: WAMessage): Promise<SendAttachment[]> {
+    const hasMedia = payload.media?.url;
+    if (!hasMedia) {
+      return [];
+    }
+
+    const media = payload.media!;
+    this.logger.info(`Downloading media from '${media.url}'...`);
+    const buffer = await this.waha.fetch(media.url);
+    const fileContent = buffer.toString('base64');
+    let filename = media.filename;
+    if (!filename) {
+      const extension = mime.extension(media.mimetype);
+      filename = `no-filename.${extension}`;
+    }
+
+    const attachment: SendAttachment = {
+      content: fileContent,
+      filename,
+      encoding: 'base64',
+    };
+    this.logger.info(`Downloaded media from '${media.url}' as '${filename}'`);
+    return [attachment];
+  }
+}
@@ -0,0 +1,32 @@
+import { JobLink } from '@waha/apps/app_sdk/JobUtils';
+import { Locale } from '@waha/apps/chatwoot/i18n/locale';
+import { TKey } from '@waha/apps/chatwoot/i18n/templates';
+import { Job } from 'bullmq';
+import { ChatWootMessagePartial } from '@waha/apps/chatwoot/consumers/waha/base';
+import type { proto } from '@adiwajshing/baileys';
+import { WAMessage } from '@waha/structures/responses.dto';
+import { MessageToChatWootConverter } from '@waha/apps/chatwoot/messages/to/chatwoot';
+
+export class UnsupportedMessage implements MessageToChatWootConverter {
+  constructor(
+    private readonly locale: Locale,
+    private readonly job: Job,
+  ) {}
+
+  convert(
+    payload: WAMessage,
+    protoMessage: proto.Message | null,
+  ): ChatWootMessagePartial {
+    void payload;
+    void protoMessage;
+    const content = this.locale
+      .key(TKey.WA_TO_CW_MESSAGE_UNSUPPORTED)
+      .render({ details: JobLink(this.job) });
+
+    return {
+      content,
+      attachments: [],
+      private: true,
+    };
+  }
+}
@@ -0,0 +1,24 @@
+import { WAMessage } from '@waha/structures/responses.dto';
+import type { proto } from '@adiwajshing/baileys';
+import { ChatWootMessagePartial } from '@waha/apps/chatwoot/consumers/waha/base';
+
+export { resolveProtoMessage } from './utils/proto';
+export { TextMessage } from './TextMessage';
+export { LocationMessage } from './LocationMessage';
+export { ShareContactMessage } from './ShareContactMessage';
+export { UnsupportedMessage } from './UnsupportedMessage';
+export { MessageEdited } from './MessageEdited';
+export { FacebookAdMessage } from './FacebookAdMessage';
+export { PollMessage } from './PollMessage';
+export { EventMessage } from './EventMessage';
+export { PixMessage } from './PixMessage';
+export { ListMessage } from './ListMessage';
+
+export type Awaitable<T> = T | Promise<T>;
+
+export interface MessageToChatWootConverter {
+  convert(
+    payload: WAMessage,
+    protoMessage: proto.Message | null,
+  ): Awaitable<ChatWootMessagePartial | null>;
+}
@@ -0,0 +1,17 @@
+import { WhatsappToMarkdown } from './markdown';
+
+describe('WhatsappToMarkdown', () => {
+  it('converts asterisks to bold', () => {
+    const input = '*bold*';
+    expect(WhatsappToMarkdown(input)).toBe('**bold**');
+  });
+  it('converts underscores to italic', () => {
+    const input = '_italic_';
+    expect(WhatsappToMarkdown(input)).toBe('*italic*');
+  });
+  it('handles multiple transformations at once', () => {
+    const input = `*bold* | _italic_ | ~strike~ | \`one line code\` | \`\`\`\nmultiple lines\`\`\` `;
+    const expected = `**bold** | *italic* | ~~strike~~ | \`one line code\` | \`\`\`\nmultiple lines\`\`\` `;
+    expect(WhatsappToMarkdown(input)).toBe(expected);
+  });
+});
@@ -0,0 +1,17 @@
+export function WhatsappToMarkdown(text: string): string {
+  if (!text) {
+    return text;
+  }
+  if (text == '') {
+    return '';
+  }
+  return (
+    text
+      // Bold: *bold* → **bold**
+      .replace(/\*(.*?)\*/g, '**$1**')
+      // Strikethrough: ~strike~ → ~~strike~~
+      .replace(/~(.*?)~/g, '~~$1~~')
+      // Italic: _italic_ → *italic*
+      .replace(/_(.*?)_/g, '*$1*')
+  );
+}
@@ -0,0 +1,55 @@
+import { camelCaseKeysDeep } from './proto';
+
+describe('camelCaseKeysDeep', () => {
+  it('URL to url', () => {
+    const input = { URL: 'https://example.com/image.png' };
+
+    const result = camelCaseKeysDeep(input);
+
+    expect(result).toEqual({
+      url: 'https://example.com/image.png',
+    });
+  });
+
+  it('converts originalImageURL to originalImageUrl', () => {
+    const input = { originalImageURL: 'https://example.com/image.png' };
+
+    const result = camelCaseKeysDeep(input);
+
+    expect(result).toEqual({
+      originalImageUrl: 'https://example.com/image.png',
+    });
+  });
+
+  it('keeps externalAdReply as externalAdReply', () => {
+    const input = { externalAdReply: { title: 'Sample' } };
+
+    const result = camelCaseKeysDeep(input);
+
+    expect(result).toEqual({ externalAdReply: { title: 'Sample' } });
+  });
+
+  it('converts PascalCase keys to pascalCase', () => {
+    const input = { PascalCase: 'value' };
+
+    const result = camelCaseKeysDeep(input);
+
+    expect(result).toEqual({ pascalCase: 'value' });
+  });
+
+  it('camel cases keys nested inside arrays while keeping primitive entries intact', () => {
+    const input = [
+      { MixedCaseKey: 'value', inner_object: { AnotherNestedKey: 42 } },
+      'STRING_VALUE',
+      10,
+    ];
+
+    const result = camelCaseKeysDeep(input);
+
+    expect(result).toEqual([
+      { mixedCaseKey: 'value', innerObject: { anotherNestedKey: 42 } },
+      'STRING_VALUE',
+      10,
+    ]);
+  });
+});
@@ -0,0 +1,38 @@
+import { WAMessage } from '@waha/structures/responses.dto';
+import type { proto } from '@adiwajshing/baileys';
+import * as lodash from 'lodash';
+
+export function camelCaseKeysDeep<T = any>(input: unknown): T {
+  if (Array.isArray(input)) return input.map(camelCaseKeysDeep) as unknown as T;
+  if (input && typeof input === 'object') {
+    const mapped = lodash.mapKeys(input as Record<string, unknown>, (_v, k) =>
+      lodash.camelCase(k),
+    );
+    return lodash.mapValues(mapped, camelCaseKeysDeep) as unknown as T;
+  }
+  return input as T;
+}
+
+export function resolveProtoMessage(payload: WAMessage): proto.Message | null {
+  // GOWS
+  if (payload._data.Message) {
+    const protoMessage = payload._data.Message;
+    // mediaURL => mediaUrl
+    // otherAttributes => otherAttributes
+    return camelCaseKeysDeep(protoMessage);
+  }
+
+  // NOWEB
+  if (payload._data.message) {
+    return payload._data.message;
+  }
+  // WEBJS - not available
+  return null;
+}
+
+export function isEmptyString(content: string) {
+  if (!content) {
+    return true;
+  }
+  return content === '' || content === '\n';
+}
@@ -1,4 +1,4 @@
-import { MarkdownToWhatsApp, WhatsappToMarkdown } from './text';
+import { MarkdownToWhatsApp } from './markdown';

 describe('MarkdownToWhatsApp', () => {
  it('converts triple-backtick blocks', () => {
@@ -15,19 +15,3 @@ describe('MarkdownToWhatsApp', () => {
    expect(MarkdownToWhatsApp(input)).toBe(expected);
  });
 });
-
-describe('WhatsappToMarkdown', () => {
-  it('converts asterisks to bold', () => {
-    const input = '*bold*';
-    expect(WhatsappToMarkdown(input)).toBe('**bold**');
-  });
-  it('converts underscores to italic', () => {
-    const input = '_italic_';
-    expect(WhatsappToMarkdown(input)).toBe('*italic*');
-  });
-  it('handles multiple transformations at once', () => {
-    const input = `*bold* | _italic_ | ~strike~ | \`one line code\` | \`\`\`\nmultiple lines\`\`\` `;
-    const expected = `**bold** | *italic* | ~~strike~~ | \`one line code\` | \`\`\`\nmultiple lines\`\`\` `;
-    expect(WhatsappToMarkdown(input)).toBe(expected);
-  });
-});
@@ -23,21 +23,3 @@ export function MarkdownToWhatsApp(text: string): string {
      .replace(/^[-+*] (.*)/gm, '* $1')
  );
 }
-
-export function WhatsappToMarkdown(text: string): string {
-  if (!text) {
-    return text;
-  }
-  if (text == '') {
-    return '';
-  }
-  return (
-    text
-      // Bold: *bold* → **bold**
-      .replace(/\*(.*?)\*/g, '**$1**')
-      // Strikethrough: ~strike~ → ~~strike~~
-      .replace(/~(.*?)~/g, '~~$1~~')
-      // Italic: _italic_ → *italic*
-      .replace(/_(.*?)_/g, '*$1*')
-  );
-}
@@ -23,6 +23,8 @@ export class ChatWootWAHAQueueService {
    private readonly queueMessageEdited: Queue,
    @InjectQueue(QueueName.WAHA_MESSAGE_REVOKED)
    private readonly queueMessageRevoked: Queue,
+    @InjectQueue(QueueName.WAHA_MESSAGE_ACK)
+    private readonly queueMessageAck: Queue,
    @InjectQueue(QueueName.WAHA_SESSION_STATUS)
    private readonly queueSessionStatus: Queue,
  ) {}
@@ -42,6 +44,8 @@ export class ChatWootWAHAQueueService {
        return this.queueMessageEdited;
      case WAHAEvents.MESSAGE_REVOKED:
        return this.queueMessageRevoked;
+      case WAHAEvents.MESSAGE_ACK:
+        return this.queueMessageAck;
      case WAHAEvents.SESSION_STATUS:
        return this.queueSessionStatus;
      default:
@@ -11,13 +11,14 @@ import {
 } from '@waha/structures/chatting.dto';
 import { SessionInfo } from '@waha/structures/sessions.dto';
 import axios, { AxiosInstance } from 'axios';
+import { Auth } from '@waha/core/auth/config';

 export class WAHASelf {
  public client: AxiosInstance;

  constructor() {
    // Set 'X-Api-Key'
-    const key = process.env.WAHA_API_KEY_PLAIN;
+    const key = Auth.keyplain.value;
    const port =
      parseInt(process.env.PORT) ||
      parseInt(process.env.WHATSAPP_API_PORT) ||
@@ -5,6 +5,7 @@ import { IgnoreJidConfig } from '@waha/core/utils/jids';

 import { parseBool } from './helpers';
 import { WebhookConfig } from './structures/webhooks.config.dto';
+import { Auth } from '@waha/core/auth/config';

@Injectable()
 export class WhatsappConfigService implements OnApplicationBootstrap {
@@ -139,10 +140,7 @@ export class WhatsappConfigService implements OnApplicationBootstrap {
  }

  getApiKey(): string | undefined {
-    return (
-      this.configService.get('WHATSAPP_API_KEY', '') ||
-      this.configService.get('WAHA_API_KEY', '')
-    );
+    return Auth.key.value;
  }

  getExcludedPaths(): string[] {
@@ -43,6 +43,7 @@ import { complete } from '@waha/utils/reactive/complete';
 import { SwitchObservable } from '@waha/utils/reactive/SwitchObservable';
 import axios from 'axios';
 import axiosRetry from 'axios-retry';
+import { Agent as HttpsAgent } from 'https';
 import * as fs from 'fs';
 import * as lodash from 'lodash';
 import * as NodeCache from 'node-cache';
@@ -53,7 +54,6 @@ import {
  delay,
  filter,
  of,
-  pairwise,
  retry,
  scan,
  share,
@@ -1076,11 +1076,24 @@ export abstract class WhatsappSession {
  /**
   * Fetches the content from the specified URL and returns it as a Buffer.
   */
-  public async fetch(url: string): Promise<Buffer> {
-    return axios.get(url, { responseType: 'arraybuffer' }).then((res) => {
+  public fetch(url: string): Promise<Buffer> {
+    return fetchBuffer(url);
+  }
+}
+
+const InsecureHttpsAgent = new HttpsAgent({
+  rejectUnauthorized: false,
+});
+
+export async function fetchBuffer(url: string): Promise<Buffer> {
+  return axios
+    .get(url, {
+      responseType: 'arraybuffer',
+      httpsAgent: InsecureHttpsAgent,
+    })
+    .then((res) => {
      return Buffer.from(res.data);
    });
-  }
 }

 export function getGroupInviteLink(code: string) {
@@ -6,11 +6,15 @@ import {
  NoAuth,
  PlainApiKeyAuth,
 } from '@waha/core/auth/auth';
+import { ReportGeneratedValue } from '@waha/core/auth/config';

 export function ApiKeyAuthFactory(
  config: WhatsappConfigService,
  logger: LoggerService,
 ): IApiKeyAuth {
+  setTimeout(() => {
+    ReportGeneratedValue();
+  }, 4000);
  const apiKey = config.getApiKey();
  if (!apiKey) {
    setTimeout(() => {
@@ -36,18 +40,5 @@ export function ApiKeyAuthFactory(
  }

  // Fallback to plain text
-  setTimeout(() => {
-    logger.warn('⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️');
-    logger.warn(
-      'WARNING: Plain text API key detected. This is a security risk.',
-    );
-    logger.warn(
-      'Your API key can be exposed in environment variables or process lists.',
-    );
-    logger.warn(
-      'For better security, use WAHA_API_KEY=sha512:{SHA512_HASH_FOR_YOUR_API_KEY}',
-    );
-    logger.warn('⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️⚠️');
-  }, 2000);
  return new PlainApiKeyAuth(apiKey);
 }
@@ -0,0 +1,154 @@
+import { parseBool } from '@waha/helpers';
+
+export interface SValue {
+  param: string;
+  value: string | null;
+  generated: boolean;
+}
+
+function rand() {
+  return crypto.randomUUID().toString().replace(/-/g, '');
+}
+
+function FromEnv(
+  param: string,
+  skip: boolean,
+  adefault: string,
+  search: any[],
+): SValue {
+  let value = process.env[param];
+  const common = search.includes(value);
+  if (common && !skip) {
+    // Use generated value for the setting
+    return {
+      param: param,
+      value: adefault,
+      generated: true,
+    };
+  }
+
+  return {
+    param: param,
+    value: value,
+    generated: false,
+  };
+}
+
+const keys = [
+  '',
+  null,
+  undefined,
+  '123',
+  '321',
+  'waha',
+  'admin',
+  '00000000000000000000000000000000',
+  '11111111111111111111111111111111',
+  'sha512:98b6d128682e280b74b324ca82a6bae6e8a3f7174e0605bfd52eb9948fad8984854ec08f7652f32055c4a9f12b69add4850481d9503a7f2225501671d6124648',
+];
+
+const nulls = ['', null, undefined];
+
+interface UserPassword {
+  username: SValue;
+  password: SValue;
+}
+
+export class AuthConfig {
+  public key: SValue;
+  public keyplain: SValue;
+  public dashboard: UserPassword;
+  public swagger: UserPassword;
+
+  constructor() {
+    if (process.env.WHATSAPP_API_KEY) {
+      process.env.WAHA_API_KEY = process.env.WHATSAPP_API_KEY;
+    }
+    this.key = FromEnv(
+      'WAHA_API_KEY',
+      parseBool(process.env.WAHA_NO_API_KEY),
+      rand(),
+      keys,
+    );
+
+    this.keyplain = FromEnv(
+      'WAHA_API_KEY_PLAIN',
+      false,
+      this.key.value?.startsWith('sha512:') ? null : this.key.value,
+      [],
+    );
+
+    this.dashboard = this.getDashboard();
+    this.swagger = this.getSwagger();
+  }
+
+  private getDashboard(): UserPassword {
+    const password = FromEnv(
+      'WAHA_DASHBOARD_PASSWORD',
+      parseBool(process.env.WAHA_DASHBOARD_NO_PASSWORD),
+      rand(),
+      keys,
+    );
+    const username = FromEnv(
+      'WAHA_DASHBOARD_USERNAME',
+      false,
+      'admin',
+      password.value ? nulls : [],
+    );
+    return {
+      username: username,
+      password: password,
+    };
+  }
+
+  private getSwagger(): UserPassword {
+    const password = FromEnv(
+      'WHATSAPP_SWAGGER_PASSWORD',
+      parseBool(process.env.WHATSAPP_SWAGGER_NO_PASSWORD),
+      this.dashboard.password.value,
+      keys,
+    );
+    const username = FromEnv(
+      'WHATSAPP_SWAGGER_USERNAME',
+      false,
+      'admin',
+      password.value ? nulls : [],
+    );
+    return {
+      username: username,
+      password: password,
+    };
+  }
+}
+
+export const Auth = new AuthConfig();
+
+export function ReportGeneratedValue() {
+  let values = [
+    Auth.key,
+    Auth.dashboard.username,
+    Auth.dashboard.password,
+    Auth.swagger.username,
+    Auth.swagger.password,
+  ];
+  values = values.filter((key) => key.generated);
+  if (values.length === 0) {
+    return;
+  }
+  console.warn('');
+  console.warn('⬇️ ⬇️ ⬇️ ⬇️ ⬇️ ⬇️ ⬇️ ⬇️ ⬇️ ⬇️ ⬇️ ⬇️');
+  console.warn('Generated credentials (persist to .env or WAHA_* env vars)');
+  console.warn(
+    'Save these values to your environment (.env or WAHA_*) to reuse them; new keys are generated on every start otherwise.',
+  );
+  console.warn('');
+  console.warn("cat <<'EOF' > .env");
+  console.warn('');
+  for (const key of values) {
+    console.warn(`${key.param}=${key.value}`);
+  }
+  console.warn('EOF');
+  console.warn('');
+  console.warn('Generated credentials ready to copy');
+  console.warn('⬆️ ⬆️ ⬆️ ⬆️ ⬆️ ⬆️ ⬆️ ⬆️ ⬆️ ⬆️ ⬆️ ⬆️');
+}
@@ -3,6 +3,7 @@ import { ConfigService } from '@nestjs/config';
 import { InjectPinoLogger, PinoLogger } from 'nestjs-pino';

 import { parseBool } from '../../helpers';
+import { Auth } from '@waha/core/auth/config';

@Injectable()
 export class DashboardConfigServiceCore {
@@ -20,8 +21,8 @@ export class DashboardConfigServiceCore {
  }

  get credentials(): [string, string] | null {
-    const user = this.configService.get('WAHA_DASHBOARD_USERNAME', '');
-    const password = this.configService.get('WAHA_DASHBOARD_PASSWORD', '');
+    const user = Auth.dashboard.username.value || '';
+    const password = Auth.dashboard.password.value || '';
    if (!user && !password) {
      return null;
    }
@@ -3,6 +3,7 @@ import { ConfigService } from '@nestjs/config';
 import { InjectPinoLogger, PinoLogger } from 'nestjs-pino';

 import { parseBool } from '../../helpers';
+import { Auth } from '@waha/core/auth/config';

@Injectable()
 export class SwaggerConfigServiceCore {
@@ -26,14 +27,8 @@ export class SwaggerConfigServiceCore {
  }

  get credentials(): [string, string] | undefined {
-    const user = this.configService.get<string>(
-      'WHATSAPP_SWAGGER_USERNAME',
-      undefined,
-    );
-    const password = this.configService.get<string>(
-      'WHATSAPP_SWAGGER_PASSWORD',
-      undefined,
-    );
+    const user = Auth.swagger.username.value;
+    const password = Auth.swagger.password.value;
    if (!user && !password) {
      return null;
    }
@@ -943,9 +943,10 @@ export class WhatsappSessionGoWSCore extends WhatsappSession {
  async checkNumberStatus(
    request: CheckNumberStatusQuery,
  ): Promise<WANumberExistResult> {
+    let phone = request.phone.replace(/\+/g, '');
    const req = new messages.CheckPhonesRequest({
      session: this.session,
-      phones: [request.phone],
+      phones: [phone],
    });
    const response = await promisify(this.client.CheckPhones)(req);
    const data = response.toObject();
@@ -68,12 +68,13 @@ import {
 } from '@waha/core/exceptions';
 import { toVcardV3 } from '@waha/core/vcard';
 import { createAgentProxy } from '@waha/core/helpers.proxy';
+import type { Agent } from 'https';
 import { IMediaEngineProcessor } from '@waha/core/media/IMediaEngineProcessor';
 import { QR } from '@waha/core/QR';
 import { AckToStatus, StatusToAck } from '@waha/core/utils/acks';
 import { ExtractMessageKeysForRead } from '@waha/core/utils/convertors';
 import { parseMessageIdSerialized } from '@waha/core/utils/ids';
-import { isJidNewsletter, toJID } from '@waha/core/utils/jids';
+import { isJidNewsletter, toCusFormat, toJID } from '@waha/core/utils/jids';
 import { DistinctAck } from '@waha/core/utils/reactive';
 import { flipObject, splitAt } from '@waha/helpers';
 import { PairingCodeResponse } from '@waha/structures/auth.dto';
@@ -178,8 +179,6 @@ import { exclude } from '@waha/utils/reactive/ops/exclude';
 import { SingleDelayedJobRunner } from '@waha/utils/SingleDelayedJobRunner';
 import { SinglePeriodicJobRunner } from '@waha/utils/SinglePeriodicJobRunner';
 import { StatusTracker } from '@waha/utils/StatusTracker';
-import * as Buffer from 'buffer';
-import { Agent } from 'https';
 import * as lodash from 'lodash';
 import * as NodeCache from 'node-cache';
 import {
@@ -199,6 +198,7 @@ import { INowebStore } from './store/INowebStore';
 import { NowebPersistentStore } from './store/NowebPersistentStore';
 import { NowebStorageFactoryCore } from './store/NowebStorageFactoryCore';
 import { ensureNumber, extractMediaContent } from './utils';
+import { Agents } from '@waha/core/engines/noweb/types';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const promiseRetry = require('promise-retry');

@@ -307,7 +307,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
    await this.sock?.logout();
  }

-  getSocketConfig(agent, state): Partial<SocketConfig> {
+  getSocketConfig(agents: Agents | undefined, state): Partial<SocketConfig> {
    const fullSyncEnabled = this.sessionConfig?.noweb?.store?.fullSync || false;
    const browser = ['Ubuntu', 'Chrome', '20.0.04'] as WABrowserDescription;
    let markOnlineOnConnect = this.sessionConfig?.noweb?.markOnline;
@@ -315,8 +315,11 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
      markOnlineOnConnect = true;
    }
    return {
-      agent: agent,
-      fetchAgent: agent,
+      agent: agents?.socket,
+      // Baileys types still expect a Node https.Agent here,
+      // but 'undici' fetch requires a Dispatcher.
+      // Cast keeps the compiler satisfied while we pass the ProxyAgent at runtime.
+      fetchAgent: agents?.fetch as unknown as Agent,
      auth: state,
      printQRInTerminal: false,
      browser: browser,
@@ -346,9 +349,9 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
      this.authNOWEBStore = store;
    }
    const { state, saveCreds } = this.authNOWEBStore;
-    const agent = this.makeAgent();
+    const agents = this.makeProxyAgents();
    const socketConfig: SocketConfig = this.getSocketConfig(
-      agent,
+      agents,
      state,
    ) as SocketConfig;
    const sock = makeWASocket(socketConfig);
@@ -356,7 +359,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
    return sock;
  }

-  protected makeAgent(): Agent {
+  protected makeProxyAgents(): Agents | undefined {
    if (!this.proxyConfig) {
      return undefined;
    }
@@ -698,7 +701,7 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
    this.sock.ev.on('messages.upsert', ({ messages }) => {
      const meId = this.sock?.authState?.creds?.me?.id;
      for (const message of messages) {
-        if (!isRealMessage(message, meId)) {
+        if (!isRealMessage(message)) {
          continue;
        }
        if (message.key.fromMe) {
@@ -829,7 +832,8 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
  async checkNumberStatus(
    request: CheckNumberStatusQuery,
  ): Promise<WANumberExistResult> {
-    const phone = request.phone.split('@')[0];
+    let phone = request.phone.split('@')[0];
+    phone = phone.replace(/\+/g, '');
    const [result] = await this.sock.onWhatsApp(phone);
    if (!result || !result.exists) {
      return { numberExists: false };
@@ -2214,6 +2218,12 @@ export class WhatsappSessionNoWebCore extends WhatsappSession {
      proto.Message.ProtocolMessage.Type.EPHEMERAL_SYNC_RESPONSE
    )
      return;
+    if (
+      message.message?.protocolMessage?.type ===
+      proto.Message.ProtocolMessage.Type
+        .PEER_DATA_OPERATION_REQUEST_RESPONSE_MESSAGE
+    )
+      return;

    const normalizedContent = normalizeMessageContent(message.message);
    const contentType = getContentType(normalizedContent);
@@ -2626,37 +2636,6 @@ export class NOWEBEngineMediaProcessor implements IMediaEngineProcessor<any> {
  }
 }

-/**
- * Convert from 11111111111@s.whatsapp.net to 11111111111@c.us
- */
-export function toCusFormat(remoteJid) {
-  if (!remoteJid) {
-    return remoteJid;
-  }
-  if (isJidGroup(remoteJid)) {
-    return remoteJid;
-  }
-  if (isJidBroadcast(remoteJid)) {
-    return remoteJid;
-  }
-  if (isLidUser(remoteJid)) {
-    return remoteJid;
-  }
-  if (isJidNewsletter(remoteJid)) {
-    return remoteJid;
-  }
-  if (!remoteJid) {
-    return;
-  }
-  if (remoteJid == 'me') {
-    return remoteJid;
-  }
-  let number = remoteJid.split('@')[0];
-  // remove :{device} part
-  number = number.split(':')[0];
-  return ensureSuffix(number);
-}
-
 export const ALL_JID = 'all@s.whatsapp.net';

 /**
@@ -315,9 +315,7 @@ export class NowebPersistentStore implements INowebStore {
      Object.assign(message, fields);
      // In case of revoked messages - remove it
      // TODO: May be we should save the flag instead of completely removing the message
-      const isYetRealMessage =
-        esm.b.isRealMessage(message, this.socket?.authState?.creds?.me?.id) ||
-        false;
+      const isYetRealMessage = esm.b.isRealMessage(message) || false;
      if (isYetRealMessage) {
        await this.messagesRepo.upsertOne(message);
      } else {
@@ -346,8 +346,8 @@ export default (config: BaileysInMemoryStoreConfig) => {
        switch (action) {
          case 'add':
            metadata.participants.push(
-              ...participants.map((id) => ({
-                id,
+              ...participants.map((participant) => ({
+                id: participant.id,
                isAdmin: false,
                isSuperAdmin: false,
              })),
@@ -356,7 +356,7 @@ export default (config: BaileysInMemoryStoreConfig) => {
          case 'demote':
          case 'promote':
            for (const participant of metadata.participants) {
-              if (participants.includes(participant.id)) {
+              if (participants.find((p) => p.id === participant.id)) {
                participant.isAdmin = action === 'promote';
              }
            }
@@ -364,7 +364,8 @@ export default (config: BaileysInMemoryStoreConfig) => {
            break;
          case 'remove':
            metadata.participants = metadata.participants.filter(
-              (p) => !participants.includes(p.id),
+              (participant) =>
+                !participants.find((p) => p.id === participant.id),
            );
            break;
        }
@@ -0,0 +1,7 @@
+import { Agent } from 'https';
+import type { Dispatcher } from 'undici';
+
+export interface Agents {
+  socket: Agent;
+  fetch: Dispatcher;
+}
@@ -79,12 +79,19 @@ const isObjectALong = (value: any): value is Long => {
  );
 };

-export function ensureNumber(value: number | Long): number {
+export function ensureNumber(value: number | Long | string | null): number {
  if (!value) {
    // @ts-ignore
    return value;
  }
-  return typeof value === 'number' ? value : toNumber(value);
+  if (typeof value === 'string') {
+    return Number.parseInt(value, 10);
+  }
+  if (isObjectALong(value)) {
+    return toNumber(value);
+  }
+  // number
+  return value;
 }

 const toNumber = (longValue: Long): number => {
@@ -600,7 +600,8 @@ export class WhatsappSessionWebJSCore extends WhatsappSession {
  async checkNumberStatus(
    request: CheckNumberStatusQuery,
  ): Promise<WANumberExistResult> {
-    const phone = request.phone.split('@')[0];
+    let phone = request.phone.split('@')[0];
+    phone = phone.replace(/\+/g, '');
    const result = await this.whatsapp.getNumberId(phone);
    if (!result) {
      return {
@@ -1,10 +1,11 @@
-import { Agent } from 'https';
 import { HttpsProxyAgent } from 'https-proxy-agent';
 import { URL } from 'url';
+import { ProxyAgent } from 'undici';

 import { WhatsappConfigService } from '../config.service';
 import { ProxyConfig } from '../structures/sessions.dto';
 import { WhatsappSession } from './abc/session.abc';
+import { Agents } from '@waha/core/engines/noweb/types';

 export function getProxyConfig(
  config: WhatsappConfigService,
@@ -63,11 +64,15 @@ function getAuthenticatedUrl(
 * Return https Agent proxy for the config
 * @param proxyConfig
 */
-export function createAgentProxy(proxyConfig: ProxyConfig): Agent | undefined {
+export function createAgentProxy(proxyConfig: ProxyConfig): Agents | undefined {
  const url = getAuthenticatedUrl(
    proxyConfig.server,
    proxyConfig.username || '',
    proxyConfig.password || '',
  );
-  return new HttpsProxyAgent(url);
+
+  const socketAgent = new HttpsProxyAgent(url);
+  const fetchAgent = new ProxyAgent({ uri: url });
+
+  return { socket: socketAgent, fetch: fetchAgent };
 }
@@ -1,4 +1,4 @@
-import type { WAMessageKey } from '@adiwajshing/baileys';
+import { jidNormalizedUser, WAMessageKey } from '@adiwajshing/baileys';
 import { ensureSuffix } from '@waha/core/abc/session.abc';

 export function isJidNewsletter(jid: string) {
@@ -135,14 +135,11 @@ export function toCusFormat(remoteJid) {
    return remoteJid;
  }
  if (isLidUser(remoteJid)) {
-    return remoteJid;
+    return jidNormalizedUser(remoteJid);
  }
  if (isJidNewsletter(remoteJid)) {
    return remoteJid;
  }
-  if (!remoteJid) {
-    return;
-  }
  if (remoteJid == 'me') {
    return remoteJid;
  }
@@ -18,6 +18,9 @@ import { SwaggerConfiguratorCore } from './core/SwaggerConfiguratorCore';
 import { AllExceptionsFilter } from './nestjs/AllExceptionsFilter';
 import { getWAHAVersion, VERSION, WAHAVersion } from './version';
 import { loadESMModules } from '@waha/vendor/esm';
+import { setGlobalDispatcher, Agent } from 'undici';
+
+setGlobalDispatcher(new Agent({ connect: { family: 4 } }));

 const logger: Logger = pino({
  level: getPinoLogLevel(),
@@ -30,7 +30,7 @@ export function getWAHAVersion(): WAHAVersion {
 }

 export const VERSION: WAHAEnvironment = {
-  version: '2025.9.8',
+  version: '2025.10.3',
  engine: getEngineName(),
  tier: getWAHAVersion(),
  browser:
@@ -4,4 +4,6 @@ http:
    allow-insecure: true
    no-follow-redirects: true
    timeout: 5000
+    request-headers:
+      - "X-Api-Key: test"
    body: ['version']
@@ -2,11 +2,11 @@
  "waha": {
    "gows": {
      "repo": "devlikeapro/gows",
-      "ref": "v1.0.16"
+      "ref": "v1.0.18"
    },
    "dashboard": {
      "repo": "devlikeapro/dashboard",
-      "ref": "0d3523523e9d0e9d8aece8dec8a38b5fee23caad"
+      "ref": "583ee12cd77a95ca48c25dece822e3e9b4e01a23"
    }
  }
 }
@@ -5,9 +5,9 @@ __metadata:
  version: 6
  cacheKey: 8

-"@adiwajshing/baileys@github:devlikeapro/Baileys#fork-master-2025-10-03":
+"@adiwajshing/baileys@github:devlikeapro/Baileys#fork-master-2025-10-10":
  version: 7.0.0-rc.5
-  resolution: "@adiwajshing/baileys@https://github.com/devlikeapro/Baileys.git#commit=595c16de1b2f14731a81b1fe7baee6fd1f768552"
+  resolution: "@adiwajshing/baileys@https://github.com/devlikeapro/Baileys.git#commit=dc9b6b7589ba1d71ec85cff4a789b5709a60a714"
  dependencies:
    "@cacheable/node-cache": ^1.4.0
    "@hapi/boom": ^9.1.3
@@ -31,7 +31,7 @@ __metadata:
      optional: true
    link-preview-js:
      optional: true
-  checksum: 74aa8dd2ecaa9ef57ef4a5c8482a83098623a03d7504c5b4bfee255437a63a93da9fedc40acca24c954f7f28369cec036b7faa9cc5bbd3463586908c95383836
+  checksum: d79aca449353f170374e6647efe09a2e871219e0af176d62796f68860ad619ce715736380250521e304d3ca28c5af4baa397ee0a8875468f8c7ad026e95028b6
  languageName: node
  linkType: hard

@@ -8536,13 +8536,23 @@ __metadata:
  languageName: node
  linkType: hard

-"libsignal@github:devlikeapro/libsignal-node#fork-master":
+"libsignal@git+https://github.com/whiskeysockets/libsignal-node":
  version: 2.0.1
-  resolution: "libsignal@https://github.com/devlikeapro/libsignal-node.git#commit=83bc9236ee3d96ae1747cf3ca2e505b10cf97250"
+  resolution: "libsignal@https://github.com/whiskeysockets/libsignal-node.git#commit=e81ecfc32eb74951d789ab37f7e341ab66d5fff1"
  dependencies:
    curve25519-js: ^0.0.4
    protobufjs: 6.8.8
-  checksum: 3ee39bc7cbd123fa2c1f84ff53ab4e3dacfb5a00d10944960fd72156b24a5eb5af1fa5ca31b9f25b26aab107c712d8c295c85b0bed26ad6eba6d0e3f26f38927
+  checksum: bf7a7b93000c826958d3ba6de72545675d39579a7befff56e3db561d985267e402fdf485127f6f4b1c12855a99966867f28517123fbb4b882d7ef39e83057c3d
+  languageName: node
+  linkType: hard
+
+"libsignal@github:WhiskeySockets/libsignal-node#master":
+  version: 2.0.1
+  resolution: "libsignal@https://github.com/WhiskeySockets/libsignal-node.git#commit=e81ecfc32eb74951d789ab37f7e341ab66d5fff1"
+  dependencies:
+    curve25519-js: ^0.0.4
+    protobufjs: 6.8.8
+  checksum: bf7a7b93000c826958d3ba6de72545675d39579a7befff56e3db561d985267e402fdf485127f6f4b1c12855a99966867f28517123fbb4b882d7ef39e83057c3d
  languageName: node
  linkType: hard

@@ -8684,7 +8694,7 @@ __metadata:
  languageName: node
  linkType: hard

-"long@npm:^5.0.0":
+"long@npm:^5.0.0, long@npm:^5.3.2":
  version: 5.3.2
  resolution: "long@npm:5.3.2"
  checksum: be215816b563f4ca27ad3677678b53415bc489f9e3466414e54d2d85f5f8e86768547fa58493bacfb363ffc57a664debc83403ccc2178aef0c40aca28bad47c9
@@ -12327,6 +12337,13 @@ __metadata:
  languageName: node
  linkType: hard

+"undici@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "undici@npm:7.16.0"
+  checksum: dca60e323e44c2d408e0d1f5eb540632ad4e75631d5b6fcd7791876bab54e0e263a66e5606eaa717d436b2db5988c2f4af912dfa221ce53e3fc7fcb7d224c9cd
+  languageName: node
+  linkType: hard
+
 "unicorn-magic@npm:^0.3.0":
  version: 0.3.0
  resolution: "unicorn-magic@npm:0.3.0"
@@ -12494,7 +12511,7 @@ __metadata:
  version: 0.0.0-use.local
  resolution: "waha@workspace:."
  dependencies:
-    "@adiwajshing/baileys": "github:devlikeapro/Baileys#fork-master-2025-10-03"
+    "@adiwajshing/baileys": "github:devlikeapro/Baileys#fork-master-2025-10-10"
    "@adiwajshing/keyed-db": ^0.2.4
    "@aws-sdk/client-s3": ^3.633.0
    "@aws-sdk/s3-request-presigner": ^3.633.0
@@ -12558,9 +12575,10 @@ __metadata:
    joi: ^17.13.3
    knex: ^3.1.0
    libphonenumber-js: ^1.10.36
-    libsignal: "github:devlikeapro/libsignal-node#fork-master"
+    libsignal: "github:WhiskeySockets/libsignal-node#master"
    link-preview-js: ^3.0.4
    lodash: ^4.17.21
+    long: ^5.3.2
    mime-types: ^2.1.27
    mongodb: 6.9.0
    mustache: ^4.2.0
@@ -12592,6 +12610,7 @@ __metadata:
    tsconfig-paths: ^4.1.0
    typescript: 5.9.2
    ulid: ^2.3.0
+    undici: ^7.16.0
    whatsapp-web.js: "github:devlikeapro/whatsapp-web.js#fork-main-2025-09-10"
    write-file-atomic: ^6.0.0
    yaml: ^2.7.1
@@ -12696,7 +12715,7 @@ __metadata:

 "whatsapp-web.js@github:devlikeapro/whatsapp-web.js#fork-main-2025-09-10":
  version: 1.34.1
-  resolution: "whatsapp-web.js@https://github.com/devlikeapro/whatsapp-web.js.git#commit=b11112cdcfecdfd5b13b504fda75fc0558b22e1d"
+  resolution: "whatsapp-web.js@https://github.com/devlikeapro/whatsapp-web.js.git#commit=130dbdb5608d9d6add1fe8712dc9e8be6a4bab34"
  dependencies:
    "@pedroslopez/moduleraid": ^5.0.2
    archiver: ^5.3.1
@@ -12714,7 +12733,7 @@ __metadata:
      optional: true
    unzipper:
      optional: true
-  checksum: f1f17eace3c0d82c1dfe674ea884db3be25b566d8322fd34167827aeb1044df11c1a3dcfc2605e4a5b613bd98e21cfd7d4dddd9a2926c3a0ec0fa57ec9501597
+  checksum: fd1fa94beab523b7b0becec27bd626e350805e1cdcefe81b4648e4a1c865fab8eeee9ab5a7c2d72d83969647c108df446ee2ffa2a475a0024acb75007fd96a53
  languageName: node
  linkType: hard
Author	SHA1	Message	Date
devlikepro	81854ad7ec	[core] Fix smoke test Release / WEBJS - chrome - amd64 - chrome (push) Waiting to run Details Release / WEBJS - chromium - amd64 - latest (push) Waiting to run Details Release / WEBJS - chromium - linux/arm64 - arm (push) Waiting to run Details Release / GOWS - none - amd64 - gows (push) Waiting to run Details Release / GOWS - none - linux/arm64 - gows-arm (push) Waiting to run Details Release / NOWEB - none - amd64 - noweb (push) Waiting to run Details Release / NOWEB - none - linux/arm64 - noweb-arm (push) Waiting to run Details	2025-10-16 17:07:47 +07:00
devlikepro	5261d4f281	[core] 2025.10.3	2025-10-16 16:57:01 +07:00
devlikepro	72d9d94342	[core] NOWEB - use upstream libsignal	2025-10-16 16:57:01 +07:00
devlikepro	b782ad27a2	[core] ChatWoot - mark read fix one more time	2025-10-16 16:56:36 +07:00
devlikepro	d7dad5e6c2	[core] rm unused imports	2025-10-16 16:56:35 +07:00
devlikepro	8765bb4412	[core] init-waha	2025-10-16 16:56:35 +07:00
devlikepro	984be25d51	[core] Replace 111 as well	2025-10-16 16:56:30 +07:00
devlikepro	70620207dd	[core] Adjust .env	2025-10-16 16:56:29 +07:00
devlikepro	a96200f981	[core] Adjust message	2025-10-16 16:56:29 +07:00
devlikepro	4978abf3d8	[core] Up GOWS fix #1503 fix #1511	2025-10-16 16:56:27 +07:00
devlikepro	a67d84f21e	[core] ChatWoot - List Message	2025-10-16 16:56:27 +07:00
devlikepro	91f59b38fd	[core] Dashboard - Chats fix #1454	2025-10-16 16:56:27 +07:00
devlikepro	d0ec351910	[core] Fix /api/sendImage when using proxy fix #1449 fix #1510	2025-10-16 16:56:26 +07:00
devlikepro	a7b12874fb	[core] Require auth by default	2025-10-16 16:56:24 +07:00
devlikepro	cd2c7bdd86	[core] Up creds in .env	2025-10-16 16:56:24 +07:00
devlikepro	045077143f	[core] no warning about plain key	2025-10-16 16:56:24 +07:00
devlikepro	bcd2199687	[core] ChatWoot - remove (WAHA) from contact name	2025-10-16 16:56:20 +07:00
devlikepro	af108eede4	[core] NOWEB - normalize @lid fix #1493	2025-10-16 16:56:19 +07:00
devlikepro	ee1cf838b8	[core] NOWEB - use IPv4 by default	2025-10-16 16:56:19 +07:00
devlikepro	0fc74895da	[core] Up NOWEB - add more logs for media	2025-10-16 16:56:19 +07:00
devlikepro	394937c154	[core] 2025.10.2 Release / WEBJS - chrome - amd64 - chrome (push) Waiting to run Details Release / WEBJS - chromium - amd64 - latest (push) Waiting to run Details Release / WEBJS - chromium - linux/arm64 - arm (push) Waiting to run Details Release / GOWS - none - amd64 - gows (push) Waiting to run Details Release / GOWS - none - linux/arm64 - gows-arm (push) Waiting to run Details Release / NOWEB - none - amd64 - noweb (push) Waiting to run Details Release / NOWEB - none - linux/arm64 - noweb-arm (push) Waiting to run Details	2025-10-14 15:21:40 +07:00
devlikepro	71f9adeff4	[core] ChatWoot - ignore fromMe in ack mention #1492	2025-10-14 15:21:40 +07:00
devlikepro	e13ccdab9c	[core] ChatWoot - disable error/succeeded messages mention #1492 mention #1395	2025-10-14 15:21:40 +07:00
devlikepro	2074748a7a	[core] ChatWoot - no message.ack error mention #1492	2025-10-14 15:21:39 +07:00
devlikepro	283d63394e	[core] Up NOWEB fix #1495 fix #1499	2025-10-14 15:21:39 +07:00
devlikepro	5cfb53c367	[core] 2025.10.1 Release / WEBJS - chrome - amd64 - chrome (push) Waiting to run Details Release / WEBJS - chromium - amd64 - latest (push) Waiting to run Details Release / WEBJS - chromium - linux/arm64 - arm (push) Waiting to run Details Release / GOWS - none - amd64 - gows (push) Waiting to run Details Release / GOWS - none - linux/arm64 - gows-arm (push) Waiting to run Details Release / NOWEB - none - amd64 - noweb (push) Waiting to run Details Release / NOWEB - none - linux/arm64 - noweb-arm (push) Waiting to run Details	2025-10-12 18:45:57 +07:00
devlikepro	9466407b8a	[core] ChatWoot - update last seen (on message.ack) closes #1436 fixes #1319	2025-10-12 18:45:56 +07:00
devlikepro	4b65f0c462	[core] ChatWoot - up to v4.6.0	2025-10-12 18:45:56 +07:00
devlikepro	23504b35c8	[core] ChatWoot - remove /n at the end of any templated	2025-10-12 18:45:55 +07:00
devlikepro	dd6ec4ca3a	[core] ChatWoot - Pix fixes	2025-10-12 18:45:55 +07:00
devlikepro	8235e5a111	[core] ChatWoot - i18n - pt enable timeZone Sao Paulo	2025-10-12 18:45:55 +07:00
devlikepro	55499a6144	[core] ChatWoot - i18n - datetime	2025-10-12 18:45:54 +07:00
devlikepro	9dbc4a6085	[core] ChatWoot - i18n - poll, event, pix	2025-10-12 18:45:54 +07:00
devlikepro	f7c6ce847c	[core] ChatWoot - i18n - poll no empty line	2025-10-12 18:45:53 +07:00
devlikepro	84eed00415	[core] ChatWoot - i18n - location url (not URL)	2025-10-12 18:45:53 +07:00
devlikepro	51aa0e3154	[core] ChatWoot - i18n - datetime	2025-10-12 18:45:52 +07:00
devlikepro	77893a0eb0	[core] ChatWoot - i18n - locale base	2025-10-12 18:45:52 +07:00
devlikepro	4a866d8a08	[core] ChatWoot - PIX (cherry picked from bergpinheiro/waha@696de94859) Thanks @bergpinheiro Co-authored-by: bergpinheiro <berg.pinheiro2009@gmail.com>	2025-10-12 18:45:52 +07:00
devlikepro	f912353a5c	[core] ChatWoot - Event Message (cherry picked from bergpinheiro/waha@696de94859) Thanks @bergpinheiro Co-authored-by: bergpinheiro <berg.pinheiro2009@gmail.com>	2025-10-12 18:45:51 +07:00
devlikepro	a6a1d8dc28	[core] ChatWoot - Poll message (cherry picked from bergpinheiro/waha@696de94859) Thanks @bergpinheiro Co-authored-by: bergpinheiro <berg.pinheiro2009@gmail.com>	2025-10-12 18:45:50 +07:00
devlikepro	150e73aa74	[core] ChatWoot - adjust location message (cherry picked from bergpinheiro/waha@696de94859) Thanks @bergpinheiro Co-authored-by: bergpinheiro <berg.pinheiro2009@gmail.com>	2025-10-12 18:45:49 +07:00
devlikepro	a9300b3134	[core] ChatWoot add URL test	2025-10-12 18:45:48 +07:00
devlikepro	bbe3859085	[core] ChatWoot - Facebook Ads Message Template closes #1461 (cherry picked from bergpinheiro/waha@5863590208) Thanks @bergpinheiro Co-authored-by: bergpinheiro <berg.pinheiro2009@gmail.com>	2025-10-12 18:45:48 +07:00
devlikepro	b420548dd9	[core] export fetchBuffer	2025-10-12 18:45:47 +07:00
devlikepro	741483eec7	[core] ChatWoot - remove unused getAttachments in message.reaction	2025-10-12 18:45:47 +07:00
devlikepro	2acf7e4e17	[core] ChatWoot - add name for location message	2025-10-12 18:45:46 +07:00
devlikepro	9bca6d904d	[core] ChatWoot - Refactor message.any	2025-10-12 18:45:45 +07:00
devlikepro	857c586df6	[core] AGENTS.md	2025-10-12 18:45:45 +07:00
devlikepro	df8cb7cecb	[core] NOWEB - fix ssl issue fix #1474	2025-10-12 18:45:45 +07:00
devlikepro	9d0050adb8	[core] NOWEB - filter PEER_DATA_OPERATION_REQUEST_RESPONSE_MESSAGE fix #1459	2025-10-12 18:45:44 +07:00
devlikepro	df927ab04a	[core] Remove + at the start fix #1475	2025-10-12 18:45:43 +07:00
devlikepro	02e5934e8f	[core] Up NOWEB 2025-10-10 - fixes	2025-10-12 18:45:42 +07:00
devlikepro	825a4152db	[core] Up NOWEB 2025-10-10	2025-10-12 18:45:41 +07:00
devlikepro	81b10099af	[core] Up WEBJS fix #1469 fix #1468	2025-10-12 18:45:41 +07:00
devlikepro	3be5f328b0	[core] Up GOWS	2025-10-12 18:45:41 +07:00
devlikepro	5caa3b8b81	[core] do not rename title	2025-10-10 10:07:02 +07:00
devlikepro	8231bf7d8e	[core] GitHub - en/pt by default	2025-10-06 18:30:15 +07:00