chore: update development channel 01.00.06-dev-dev [skip ci]

chore(version): auto-bump 01.00.06-dev-dev [skip ci]
feat: low-priority issues #19-#22
2026-05-28 18:42:22 +00:00 · 2026-05-28 18:42:20 +00:00 · 2026-05-28 13:42:07 -05:00 · 2026-05-28 13:41:34 -05:00 · 2026-05-28 18:36:31 +00:00 · 2026-05-28 18:36:29 +00:00
93 changed files with 3691 additions and 622 deletions
@@ -4,7 +4,7 @@
        <name>MokoJoomCross</name>
        <org>MokoConsulting</org>
        <description>Cross-posting Joomla content to social media, email marketing, and chat platforms</description>
-        <version>01.00.01-dev</version>
+        <version>01.00.06-dev-dev</version>
        <license spdx="GPL-3.0-or-later">GNU General Public License v3</license>
    </identity>
    <governance>
@@ -68,6 +68,13 @@ jobs:
            --path . --version "$VERSION" --branch dev 2>/dev/null || true
          php ${MOKO_CLI}/version_check.php --path . --fix 2>/dev/null || true

+          # Append -dev suffix to all manifest <version> tags
+          find . -maxdepth 4 -name "*.xml" ! -path "./.git/*" ! -path "./build/*" \
+            -exec grep -l "<version>${VERSION}</version>" {} \; 2>/dev/null | while read f; do
+            sed -i "s|<version>${VERSION}</version>|<version>${VERSION}-dev</version>|g" "$f"
+          done
+          VERSION="${VERSION}-dev"
+
          # Commit if anything changed
          if git diff --quiet && git diff --cached --quiet; then
            echo "No version changes to commit"
@@ -78,7 +85,7 @@ jobs:
          git config --local user.name "gitea-actions[bot]"
          git remote set-url origin "https://jmiller:${{ secrets.GA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
          git add -A
-          git commit -m "chore(version): patch bump to ${VERSION} [skip ci]" \
+          git commit -m "chore(version): auto-bump patch ${VERSION} [skip ci]" \
            --author="gitea-actions[bot] <gitea-actions[bot]@mokoconsulting.tech>"
          git push origin dev
          echo "Bumped to ${VERSION}" >> $GITHUB_STEP_SUMMARY
@@ -93,6 +93,15 @@ jobs:
          # Verify version consistency across all files
          php ${MOKO_CLI}/version_check.php --path . --fix 2>/dev/null || true

+          # Append suffix to all manifest <version> tags
+          if [ -n "$SUFFIX" ]; then
+            find . -maxdepth 4 -name "*.xml" ! -path "./.git/*" ! -path "./build/*" \
+              -exec grep -l "<version>${VERSION}</version>" {} \; 2>/dev/null | while read f; do
+              sed -i "s|<version>${VERSION}</version>|<version>${VERSION}${SUFFIX}</version>|g" "$f"
+            done
+            VERSION="${VERSION}${SUFFIX}"
+          fi
+
          # Commit version bump
          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
          git config --local user.name "gitea-actions[bot]"
@@ -112,7 +121,7 @@ jobs:
          EXT_ELEMENT=$(grep '^ext_element=' "$GITHUB_OUTPUT" | tail -1 | cut -d= -f2)
          ZIP_NAME=$(grep '^zip_name=' "$GITHUB_OUTPUT" | tail -1 | cut -d= -f2)
          [ -z "$EXT_ELEMENT" ] && EXT_ELEMENT=$(echo "${GITEA_REPO}" | tr '[:upper:]' '[:lower:]' | tr -d ' -')
-          [ -z "$ZIP_NAME" ] && ZIP_NAME="${EXT_ELEMENT}-${VERSION}${SUFFIX}.zip"
+          [ -z "$ZIP_NAME" ] && ZIP_NAME="${EXT_ELEMENT}-${VERSION}.zip"

          echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
          echo "stability=${STABILITY}" >> "$GITHUB_OUTPUT"
@@ -4,18 +4,16 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: MokoStandards.Universal
+# INGROUP: moko-platform.Universal
 # REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
 # PATH: /templates/workflows/update-server.yml
-# VERSION: 04.07.00
-# BRIEF: Update server XML feed with stable/rc/beta/alpha/dev entries (universal)
+# VERSION: 05.00.00
+# BRIEF: Pre-release build + update server XML for dev/alpha/beta/rc branches
 #
-# Writes updates.xml with multiple <update> entries:
-#   - <tag>stable</tag>     on push to main (from auto-release)
-#   - <tag>rc</tag>         on push to rc/**
-#   - <tag>development</tag> on push to dev or dev/**
+# Thin wrapper around moko-platform CLI tools.
+# Builds packages, updates updates.xml, and optionally deploys via SFTP.
 #
-# Joomla filters by user's "Minimum Stability" setting.
+# Joomla filters update entries by the user's "Minimum Stability" setting.

 name: "Update Server"

@@ -66,7 +64,7 @@ permissions:

 jobs:
  update-xml:
-    name: Update updates.xml
+    name: Update Server
    runs-on: release
    if: >-
      github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch' || github.event_name == 'push'
@@ -97,28 +95,29 @@ jobs:
          if [ -d "/tmp/moko-platform" ] && [ -f "/tmp/moko-platform/composer.json" ]; then
            cd /tmp/moko-platform && composer install --no-dev --no-interaction --quiet 2>/dev/null || true
          fi
+          echo "MOKO_CLI=/tmp/moko-platform/cli" >> "$GITHUB_ENV"

-      - name: Generate updates.xml entry
-        id: update
+      - name: Detect platform
+        id: platform
+        run: php ${MOKO_CLI}/manifest_read.php --path . --github-output
+
+      - name: Resolve stability and bump version
+        id: meta
        run: |
          BRANCH="${{ github.ref_name }}"
-          REPO="${{ github.repository }}"
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-          VERSION=$(php /tmp/moko-platform/cli/version_read.php --path . 2>/dev/null || echo "0.0.0")

-          # Auto-bump patch on all branches (dev, alpha, beta, rc)
+          # Auto-bump patch version
          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
          git config --local user.name "gitea-actions[bot]"
-          BUMPED=$(php /tmp/moko-platform/cli/version_bump.php --path . 2>/dev/null || true)
-          if [ -n "$BUMPED" ]; then
-            VERSION=$(php /tmp/moko-platform/cli/version_read.php --path . 2>/dev/null || echo "$VERSION")
-            git add -A
-            git commit -m "chore(version): auto-bump patch ${VERSION} [skip ci]" \
-              --author="gitea-actions[bot] <gitea-actions[bot]@mokoconsulting.tech>" 2>/dev/null || true
-            git push 2>/dev/null || true
-          fi
+          php ${MOKO_CLI}/version_bump.php --path . 2>/dev/null || true

-          # Determine stability from branch or input
+          VERSION=$(php ${MOKO_CLI}/version_read.php --path . 2>/dev/null || echo "0.0.0")
+
+          # Propagate version to all manifest files
+          php ${MOKO_CLI}/version_set_platform.php --path . --version "$VERSION" --branch "$BRANCH" 2>/dev/null || true
+          php ${MOKO_CLI}/version_check.php --path . --fix 2>/dev/null || true
+
+          # Determine stability from branch or manual input
          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
            STABILITY="${{ inputs.stability }}"
          elif [[ "$BRANCH" == rc/* ]]; then
@@ -127,258 +126,92 @@ jobs:
            STABILITY="beta"
          elif [[ "$BRANCH" == alpha/* ]]; then
            STABILITY="alpha"
-          elif [[ "$BRANCH" == dev/* ]] || [[ "$BRANCH" == "dev" ]]; then
+          else
            STABILITY="development"
-          else
-            STABILITY="stable"
          fi

+          # Version suffix per stability stream
+          case "$STABILITY" in
+            development) SUFFIX="-dev";  TAG="development" ;;
+            alpha)       SUFFIX="-alpha"; TAG="alpha" ;;
+            beta)        SUFFIX="-beta";  TAG="beta" ;;
+            rc)          SUFFIX="-rc";    TAG="release-candidate" ;;
+            *)           SUFFIX="";       TAG="stable" ;;
+          esac
+
+          # Append suffix to all manifest <version> tags (non-stable only)
+          if [ -n "$SUFFIX" ]; then
+            find . -maxdepth 4 -name "*.xml" ! -path "./.git/*" ! -path "./build/*" \
+              -exec grep -l "<version>${VERSION}</version>" {} \; 2>/dev/null | while read f; do
+              sed -i "s|<version>${VERSION}</version>|<version>${VERSION}${SUFFIX}</version>|g" "$f"
+            done
+            VERSION="${VERSION}${SUFFIX}"
+          fi
+
+          echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
          echo "stability=${STABILITY}" >> "$GITHUB_OUTPUT"
+          echo "suffix=${SUFFIX}" >> "$GITHUB_OUTPUT"
+          echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
+          echo "display_version=${VERSION}" >> "$GITHUB_OUTPUT"

-          # Parse manifest (portable — no grep -P)
-          MANIFEST=$(find . -maxdepth 3 -name "*.xml" ! -path "./.git/*" ! -path "./build/*" -exec grep -l '<extension' {} \; 2>/dev/null | head -1)
-          if [ -z "$MANIFEST" ]; then
-            echo "No Joomla manifest found — skipping"
-            exit 0
-          fi
-
-          # Extract fields using sed (works on all runners)
-          EXT_NAME=$(sed -n 's/.*<name>\([^<]*\)<\/name>.*/\1/p' "$MANIFEST" | head -1)
-          EXT_TYPE=$(sed -n 's/.*<extension[^>]*type="\([^"]*\)".*/\1/p' "$MANIFEST" | head -1)
-          EXT_ELEMENT=$(sed -n 's/.*<element>\([^<]*\)<\/element>.*/\1/p' "$MANIFEST" | head -1)
-          EXT_CLIENT=$(sed -n 's/.*<extension[^>]*client="\([^"]*\)".*/\1/p' "$MANIFEST" | head -1)
-          EXT_FOLDER=$(sed -n 's/.*<extension[^>]*group="\([^"]*\)".*/\1/p' "$MANIFEST" | head -1)
-          EXT_VERSION=$(sed -n 's/.*<version>\([^<]*\)<\/version>.*/\1/p' "$MANIFEST" | head -1)
-          TARGET_PLATFORM=$(sed -n 's/.*\(<targetplatform[^/]*\/>\).*/\1/p' "$MANIFEST" | head -1)
-          PHP_MINIMUM=$(sed -n 's/.*<php_minimum>\([^<]*\)<\/php_minimum>.*/\1/p' "$MANIFEST" | head -1)
-
-          # Fallbacks
-          [ -z "$EXT_NAME" ] && EXT_NAME="${{ github.event.repository.name }}"
-          [ -z "$EXT_TYPE" ] && EXT_TYPE="component"
-
-          # Derive element if not in manifest: try XML filename, then repo name
-          if [ -z "$EXT_ELEMENT" ]; then
-            EXT_ELEMENT=$(basename "$MANIFEST" .xml | tr '[:upper:]' '[:lower:]')
-            case "$EXT_ELEMENT" in
-              templatedetails|manifest|*.xml) EXT_ELEMENT=$(echo "${{ github.event.repository.name }}" | tr '[:upper:]' '[:lower:]' | tr -d ' -') ;;
-            esac
-          fi
-
-          # Use manifest version if README version is empty
-          [ "$VERSION" = "0.0.0" ] && [ -n "$EXT_VERSION" ] && VERSION="$EXT_VERSION"
-
-          [ -z "$TARGET_PLATFORM" ] && TARGET_PLATFORM=$(printf '<targetplatform name="joomla" version="((5.[0-9])|(6.[0-9]))" %s>' "/")
-
-          # Joomla requires <client> on ALL extension types for update matching
-          if [ -n "$EXT_CLIENT" ]; then
-            CLIENT_TAG="<client>${EXT_CLIENT}</client>"
-          else
-            CLIENT_TAG="<client>site</client>"
-          fi
-
-          FOLDER_TAG=""
-          [ -n "$EXT_FOLDER" ] && [ "$EXT_TYPE" = "plugin" ] && FOLDER_TAG="<folder>${EXT_FOLDER}</folder>"
-
-          PHP_TAG=""
-          [ -n "$PHP_MINIMUM" ] && PHP_TAG="<php_minimum>${PHP_MINIMUM}</php_minimum>"
-
-          # Version suffix for non-stable
-          DISPLAY_VERSION="$VERSION"
-          case "$STABILITY" in
-            development) DISPLAY_VERSION="${VERSION}-dev" ;;
-            alpha)       DISPLAY_VERSION="${VERSION}-alpha" ;;
-            beta)        DISPLAY_VERSION="${VERSION}-beta" ;;
-            rc)          DISPLAY_VERSION="${VERSION}-rc" ;;
-          esac
-
-          MAJOR=$(echo "$VERSION" | awk -F. '{print $1}')
-
-          # Each stability level has its own release tag
-          case "$STABILITY" in
-            development) RELEASE_TAG="development" ;;
-            alpha)       RELEASE_TAG="alpha" ;;
-            beta)        RELEASE_TAG="beta" ;;
-            rc)          RELEASE_TAG="release-candidate" ;;
-            *)           RELEASE_TAG="v${MAJOR}" ;;
-          esac
-
-          PACKAGE_NAME="${EXT_ELEMENT}-${DISPLAY_VERSION}.zip"
-          DOWNLOAD_URL="${GITEA_URL}/${GITEA_ORG}/${GITEA_REPO}/releases/download/${RELEASE_TAG}/${PACKAGE_NAME}"
-          INFO_URL="${GITEA_URL}/${GITEA_ORG}/${GITEA_REPO}"
-
-          # -- Build install packages (ZIP + tar.gz) --------------------
-          SOURCE_DIR="src"
-          [ ! -d "$SOURCE_DIR" ] && SOURCE_DIR="htdocs"
-          if [ -d "$SOURCE_DIR" ]; then
-            EXCLUDES=".ftpignore sftp-config* *.ppk *.pem *.key .env*"
-            TAR_NAME="${EXT_ELEMENT}-${DISPLAY_VERSION}.tar.gz"
-
-            cd "$SOURCE_DIR"
-            zip -r "/tmp/${PACKAGE_NAME}" . -x $EXCLUDES
-            cd ..
-            tar -czf "/tmp/${TAR_NAME}" -C "$SOURCE_DIR" \
-              --exclude='.ftpignore' --exclude='sftp-config*' \
-              --exclude='*.ppk' --exclude='*.pem' --exclude='*.key' --exclude='.env*' .
-
-            SHA256=$(sha256sum "/tmp/${PACKAGE_NAME}" | cut -d' ' -f1)
-
-            # Ensure release exists on Gitea
-            RELEASE_JSON=$(curl -sf -H "Authorization: token ${{ secrets.GA_TOKEN }}" \
-              "${API_BASE}/releases/tags/${RELEASE_TAG}" 2>/dev/null || true)
-            RELEASE_ID=$(echo "$RELEASE_JSON" | python3 -c "import sys,json; print(json.load(sys.stdin).get('id',''))" 2>/dev/null || true)
-
-            if [ -z "$RELEASE_ID" ]; then
-              # Create release
-              RELEASE_JSON=$(curl -sf -X POST -H "Authorization: token ${{ secrets.GA_TOKEN }}" \
-                -H "Content-Type: application/json" \
-                "${API_BASE}/releases" \
-                -d "$(python3 -c "import json; print(json.dumps({
-                  'tag_name': '${RELEASE_TAG}',
-                  'name': '${RELEASE_TAG} (${DISPLAY_VERSION})',
-                  'body': '${STABILITY} release',
-                  'prerelease': True,
-                  'target_commitish': 'main'
-                }))")" 2>/dev/null || true)
-              RELEASE_ID=$(echo "$RELEASE_JSON" | python3 -c "import sys,json; print(json.load(sys.stdin).get('id',''))" 2>/dev/null || true)
-            fi
-
-            if [ -n "$RELEASE_ID" ]; then
-              # Delete existing assets with same name before uploading
-              ASSETS=$(curl -sf -H "Authorization: token ${{ secrets.GA_TOKEN }}" \
-                "${API_BASE}/releases/${RELEASE_ID}/assets" 2>/dev/null || echo "[]")
-              for ASSET_FILE in "$PACKAGE_NAME" "$TAR_NAME"; do
-                ASSET_ID=$(echo "$ASSETS" | python3 -c "
-          import sys,json
-          assets = json.load(sys.stdin)
-          for a in assets:
-              if a['name'] == '${ASSET_FILE}':
-                  print(a['id']); break
-          " 2>/dev/null || true)
-                if [ -n "$ASSET_ID" ]; then
-                  curl -sf -X DELETE -H "Authorization: token ${{ secrets.GA_TOKEN }}" \
-                    "${API_BASE}/releases/${RELEASE_ID}/assets/${ASSET_ID}" 2>/dev/null || true
-                fi
-              done
-
-              # Upload both formats
-              curl -sf -X POST -H "Authorization: token ${{ secrets.GA_TOKEN }}" \
-                -H "Content-Type: application/octet-stream" \
-                --data-binary @"/tmp/${PACKAGE_NAME}" \
-                "${API_BASE}/releases/${RELEASE_ID}/assets?name=${PACKAGE_NAME}" > /dev/null 2>&1 || true
-
-              curl -sf -X POST -H "Authorization: token ${{ secrets.GA_TOKEN }}" \
-                -H "Content-Type: application/octet-stream" \
-                --data-binary @"/tmp/${TAR_NAME}" \
-                "${API_BASE}/releases/${RELEASE_ID}/assets?name=${TAR_NAME}" > /dev/null 2>&1 || true
-            fi
-
-            echo "Packages: ${PACKAGE_NAME} + ${TAR_NAME} (SHA: ${SHA256})" >> $GITHUB_STEP_SUMMARY
-          else
-            SHA256=""
-          fi
-
-          # -- Build the new entry (canonical format matching release.yml) --
-          NEW_ENTRY=""
-          NEW_ENTRY="${NEW_ENTRY}  <update>\n"
-          NEW_ENTRY="${NEW_ENTRY}    <name>${EXT_NAME}</name>\n"
-          NEW_ENTRY="${NEW_ENTRY}    <description>${EXT_NAME} ${STABILITY} build.</description>\n"
-          NEW_ENTRY="${NEW_ENTRY}    <element>${EXT_ELEMENT}</element>\n"
-          NEW_ENTRY="${NEW_ENTRY}    <type>${EXT_TYPE}</type>\n"
-          [ -n "$CLIENT_TAG" ] && NEW_ENTRY="${NEW_ENTRY}    ${CLIENT_TAG}\n"
-          [ -n "$FOLDER_TAG" ] && NEW_ENTRY="${NEW_ENTRY}    ${FOLDER_TAG}\n"
-          NEW_ENTRY="${NEW_ENTRY}    <version>${VERSION}</version>\n"
-          NEW_ENTRY="${NEW_ENTRY}    <creationDate>$(date +%Y-%m-%d)</creationDate>\n"
-          NEW_ENTRY="${NEW_ENTRY}    <infourl title='${EXT_NAME}'>https://git.mokoconsulting.tech/${GITEA_ORG}/${GITEA_REPO}/releases/tag/${RELEASE_TAG}</infourl>\n"
-          NEW_ENTRY="${NEW_ENTRY}    <downloads>\n"
-          NEW_ENTRY="${NEW_ENTRY}      <downloadurl type='full' format='zip'>${DOWNLOAD_URL}</downloadurl>\n"
-          NEW_ENTRY="${NEW_ENTRY}    </downloads>\n"
-          [ -n "$SHA256" ] && NEW_ENTRY="${NEW_ENTRY}    <sha256>${SHA256}</sha256>\n"
-          NEW_ENTRY="${NEW_ENTRY}    <tags><tag>${STABILITY}</tag></tags>\n"
-          NEW_ENTRY="${NEW_ENTRY}    <maintainer>Moko Consulting</maintainer>\n"
-          NEW_ENTRY="${NEW_ENTRY}    <maintainerurl>https://mokoconsulting.tech</maintainerurl>\n"
-          NEW_ENTRY="${NEW_ENTRY}    <targetplatform name='joomla' version='(5|6).*'/>\n"
-          [ -n "$PHP_MINIMUM" ] && NEW_ENTRY="${NEW_ENTRY}    <php_minimum>${PHP_MINIMUM}</php_minimum>\n"
-          NEW_ENTRY="${NEW_ENTRY}  </update>"
-
-          # -- Write new entry to temp file --------------------------------
-          printf '%b' "$NEW_ENTRY" > /tmp/new_entry.xml
-
-          # -- Merge into updates.xml ----------------------------------------
-          # Cascade: stable→all | rc→rc+lower | beta→beta+lower | alpha→alpha+dev | dev→dev
-          CASCADE_MAP="stable:development,alpha,beta,rc,stable rc:development,alpha,beta,rc beta:development,alpha,beta alpha:development,alpha development:development"
-          TARGETS=""
-          for entry in $CASCADE_MAP; do
-            key="${entry%%:*}"
-            vals="${entry#*:}"
-            if [ "$key" = "${STABILITY}" ]; then
-              TARGETS="$vals"
-              break
-            fi
-          done
-          [ -z "$TARGETS" ] && TARGETS="${STABILITY}"
-
-          echo "Cascade: ${STABILITY} → ${TARGETS}"
-
-          # Create updates.xml if missing
-          if [ ! -f "updates.xml" ]; then
-            printf '%s\n' "<?xml version='1.0' encoding='UTF-8'?>" > updates.xml
-            printf '%s\n' "<!-- Copyright (C) $(date +%Y) Moko Consulting -->" >> updates.xml
-            printf '%s\n' "<updates>" >> updates.xml
-            printf '%s\n' "</updates>" >> updates.xml
-          fi
-
-          # Update existing blocks or create missing ones
-          export PY_TARGETS="$TARGETS" PY_VERSION="$VERSION" PY_DATE="$(date +%Y-%m-%d)"
-          python3 << 'PYEOF'
-          import re, os
-
-          targets = os.environ["PY_TARGETS"].split(",")
-          version = os.environ["PY_VERSION"]
-          date = os.environ["PY_DATE"]
-
-          with open("updates.xml") as f:
-              content = f.read()
-          with open("/tmp/new_entry.xml") as f:
-              new_entry_template = f.read()
-
-          for tag in targets:
-              tag = tag.strip()
-              # Build entry with this tag's name
-              new_entry = re.sub(r"<tag>[^<]*</tag>", f"<tag>{tag}</tag>", new_entry_template)
-
-              # Try to find existing block (handles both single-line and multi-line <tags>)
-              block_pattern = r"(<update>(?:(?!</update>).)*?<tag>" + re.escape(tag) + r"</tag>.*?</update>)"
-              match = re.search(block_pattern, content, re.DOTALL)
-
-              if match:
-                  # Update in place — replace entire block
-                  content = content.replace(match.group(1), new_entry.strip())
-                  print(f"  UPDATED: <tag>{tag}</tag> → {version}")
-              else:
-                  # Create — insert before </updates>
-                  content = content.replace("</updates>", "\n" + new_entry.strip() + "\n\n</updates>")
-                  print(f"  CREATED: <tag>{tag}</tag> → {version}")
-
-          # Clean up excessive blank lines
-          content = re.sub(r"\n{3,}", "\n\n", content)
-
-          with open("updates.xml", "w") as f:
-              f.write(content)
-          PYEOF
-
-          # Commit
-          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
-          git config --local user.name "gitea-actions[bot]"
-          git add updates.xml
+          # Commit version bump if changed
+          git add -A
          git diff --cached --quiet || {
-            git commit -m "chore: update updates.xml (${STABILITY}: ${DISPLAY_VERSION}) [skip ci]" \
+            git commit -m "chore(version): auto-bump ${VERSION} [skip ci]" \
              --author="gitea-actions[bot] <gitea-actions[bot]@mokoconsulting.tech>"
            git push
          }

-      # -- Sync updates.xml to main (for non-main branches) ----------------------
+      - name: Create release and upload package
+        id: package
+        run: |
+          VERSION="${{ steps.meta.outputs.version }}"
+          TAG="${{ steps.meta.outputs.tag }}"
+          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+
+          # Create or update Gitea release
+          php ${MOKO_CLI}/release_create.php \
+            --path . --version "$VERSION" --tag "$TAG" \
+            --token "${{ secrets.GA_TOKEN }}" --api-base "$API_BASE" \
+            --repo "${GITEA_REPO}" --branch "${{ github.ref_name }}" --prerelease
+
+          # Build package and upload
+          php ${MOKO_CLI}/release_package.php \
+            --path . --version "$VERSION" --tag "$TAG" \
+            --token "${{ secrets.GA_TOKEN }}" --api-base "$API_BASE" \
+            --repo "${GITEA_REPO}" --output /tmp || true
+
+      - name: Update updates.xml
+        if: steps.platform.outputs.platform == 'joomla'
+        run: |
+          VERSION="${{ steps.meta.outputs.version }}"
+          STABILITY="${{ steps.meta.outputs.stability }}"
+          SHA256="${{ steps.package.outputs.sha256_zip }}"
+
+          if [ ! -f "updates.xml" ]; then
+            echo "No updates.xml — skipping"
+            exit 0
+          fi
+
+          SHA_FLAG=""
+          [ -n "$SHA256" ] && SHA_FLAG="--sha ${SHA256}"
+
+          php ${MOKO_CLI}/updates_xml_build.php \
+            --path . --version "${VERSION}" --stability "${STABILITY}" \
+            --gitea-url "${GITEA_URL}" --org "${GITEA_ORG}" --repo "${GITEA_REPO}" \
+            ${SHA_FLAG}
+
+          # Commit and push updates.xml
+          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
+          git config --local user.name "gitea-actions[bot]"
+          git add updates.xml
+          git diff --cached --quiet || {
+            git commit -m "chore: update ${STABILITY} channel ${VERSION} [skip ci]"
+            git push
+          }
+
      - name: Sync updates.xml to main
-        if: github.ref_name != 'main'
+        if: github.ref_name != 'main' && steps.platform.outputs.platform == 'joomla'
        run: |
          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
          GA_TOKEN="${{ secrets.GA_TOKEN }}"
@@ -394,7 +227,7 @@ jobs:
          payload = json.dumps({
              'content': content,
              'sha': '${FILE_SHA}',
-              'message': 'chore: sync updates.xml from ${STABILITY} [skip ci]',
+              'message': 'chore: sync updates.xml from ${{ steps.meta.outputs.stability }} [skip ci]',
              'branch': 'main'
          }).encode()
          req = urllib.request.Request(
@@ -408,13 +241,8 @@ jobs:
              urllib.request.urlopen(req)
              print('updates.xml synced to main')
          except Exception as e:
-              print(f'ERROR: failed to sync updates.xml to main: {e}', file=sys.stderr)
-              sys.exit(1)
-          " \
-              && echo "updates.xml synced to main (${STABILITY})" >> $GITHUB_STEP_SUMMARY \
-              || echo "::error::failed to sync updates.xml to main" >> $GITHUB_STEP_SUMMARY
-          else
-            echo "::error::could not get updates.xml SHA from main — file may not exist on main yet" >> $GITHUB_STEP_SUMMARY
+              print(f'WARNING: sync to main failed: {e}', file=sys.stderr)
+          "
          fi

      - name: SFTP deploy to dev server
@@ -428,9 +256,8 @@ jobs:
          DEV_KEY: ${{ secrets.DEV_FTP_KEY }}
          DEV_PASS: ${{ secrets.DEV_FTP_PASSWORD }}
        run: |
-          # -- Permission check: admin or maintain role required --------
+          # Permission check: admin or maintain role required
          ACTOR="${{ github.actor }}"
-          REPO="${{ github.repository }}"
          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"

          PERMISSION=$(curl -sf -H "Authorization: token ${{ secrets.GA_TOKEN }}" \
@@ -463,198 +290,24 @@ jobs:
            printf ',"password":"%s"}' "$DEV_PASS" >> /tmp/sftp-config.json
          fi

-          PLATFORM=$(php /tmp/moko-platform/cli/platform_detect.php --path . 2>/dev/null || true)
-          if [ "$PLATFORM" = "waas-component" ] && [ -f "/tmp/moko-platform/deploy/deploy-joomla.php" ]; then
-            php /tmp/moko-platform/deploy/deploy-joomla.php --path . --src-dir "$SOURCE_DIR" --config /tmp/sftp-config.json
-          elif [ -f "/tmp/moko-platform/deploy/deploy-sftp.php" ]; then
-            php /tmp/moko-platform/deploy/deploy-sftp.php --path . --src-dir "$SOURCE_DIR" --config /tmp/sftp-config.json
+          PLATFORM=$(php ${MOKO_CLI}/platform_detect.php --path . 2>/dev/null || true)
+          if [ "$PLATFORM" = "waas-component" ] && [ -f "${MOKO_CLI}/../deploy/deploy-joomla.php" ]; then
+            php ${MOKO_CLI}/../deploy/deploy-joomla.php --path . --src-dir "$SOURCE_DIR" --config /tmp/sftp-config.json
+          elif [ -f "${MOKO_CLI}/../deploy/deploy-sftp.php" ]; then
+            php ${MOKO_CLI}/../deploy/deploy-sftp.php --path . --src-dir "$SOURCE_DIR" --config /tmp/sftp-config.json
          fi
          rm -f /tmp/deploy_key /tmp/sftp-config.json
          echo "SFTP deploy to dev complete" >> $GITHUB_STEP_SUMMARY

-      - name: Validate updates.xml integrity
-        run: |
-          ERRORS=0
-
-          if [ ! -f "updates.xml" ]; then
-            echo "::error::updates.xml not found"
-            exit 1
-          fi
-
-          # Well-formed XML
-          if ! python3 -c "import xml.etree.ElementTree as ET; ET.parse('updates.xml')" 2>/dev/null; then
-            echo "::error::updates.xml is not valid XML"
-            ERRORS=$((ERRORS+1))
-          fi
-
-          python3 << 'PYEOF'
-          import xml.etree.ElementTree as ET, sys, re, os
-
-          tree = ET.parse("updates.xml")
-          root = tree.getroot()
-          updates = root.findall("update")
-          errors = 0
-          warnings = 0
-          seen_tags = set()
-
-          # All 5 channels MUST be present
-          REQUIRED_CHANNELS = {"stable", "rc", "beta", "alpha", "dev"}
-          VALID_TAGS = REQUIRED_CHANNELS | {"development"}  # accept legacy alias
-          REPO = os.environ.get("GITEA_REPO", "")
-          ORG = os.environ.get("GITEA_ORG", "MokoConsulting")
-          REPO_BASE = f"https://git.mokoconsulting.tech/{ORG}/"
-
-          # Gitea release tag names per channel (Moko standard)
-          RELEASE_TAG_MAP = {
-              "stable": "stable",
-              "rc": "release-candidate",
-              "beta": "beta",
-              "alpha": "alpha",
-              "dev": "development",
-              "development": "development",
-          }
-
-          # Joomla update XML required fields per
-          # https://docs.joomla.org/Deploying_an_Update_Server
-          REQUIRED_FIELDS = ["name", "element", "type", "version", "infourl"]
-
-          for i, u in enumerate(updates):
-              tag_el = u.find("tags/tag")
-              tag = tag_el.text.strip() if tag_el is not None and tag_el.text else None
-              label = f"Entry {i+1} (<tag>{tag or '?'}</tag>)"
-
-              # -- Required Joomla fields --
-              for field in REQUIRED_FIELDS:
-                  el = u.find(field)
-                  if el is None or not (el.text or "").strip():
-                      print(f"::error::{label}: missing required <{field}>")
-                      errors += 1
-
-              # -- <downloads><downloadurl> --
-              dl = u.find("downloads/downloadurl")
-              if dl is None or not (dl.text or "").strip():
-                  print(f"::error::{label}: missing <downloads><downloadurl>")
-                  errors += 1
-              else:
-                  dl_url = dl.text.strip()
-                  # Must point to org repo
-                  if REPO_BASE not in dl_url:
-                      print(f"::error::{label}: download URL not under {REPO_BASE}: {dl_url}")
-                      errors += 1
-                  # Must end in .zip
-                  if not dl_url.endswith(".zip"):
-                      print(f"::error::{label}: download URL must end in .zip: {dl_url}")
-                      errors += 1
-                  # Must use correct Gitea release tag in path
-                  if tag and tag in RELEASE_TAG_MAP:
-                      expected_tag = RELEASE_TAG_MAP[tag]
-                      if f"/download/{expected_tag}/" not in dl_url:
-                          print(f"::error::{label}: download URL should contain /download/{expected_tag}/ but got: {dl_url}")
-                          errors += 1
-
-              # -- <client> (required for Joomla to match update) --
-              client = u.find("client")
-              if client is None or not (client.text or "").strip():
-                  print(f"::error::{label}: missing <client> (required for Joomla update matching)")
-                  errors += 1
-
-              # -- <targetplatform> --
-              tp = u.find("targetplatform")
-              if tp is None:
-                  print(f"::error::{label}: missing <targetplatform>")
-                  errors += 1
-              else:
-                  tp_name = tp.get("name", "")
-                  tp_ver = tp.get("version", "")
-                  if tp_name != "joomla":
-                      print(f"::error::{label}: targetplatform name should be 'joomla', got '{tp_name}'")
-                      errors += 1
-                  if not tp_ver:
-                      print(f"::error::{label}: targetplatform missing version regex")
-                      errors += 1
-                  elif "5" not in tp_ver or "6" not in tp_ver:
-                      print(f"::warning::{label}: targetplatform version may not cover Joomla 5+6: {tp_ver}")
-                      warnings += 1
-
-              # -- <type> must be valid Joomla type --
-              type_el = u.find("type")
-              if type_el is not None and type_el.text:
-                  valid_types = {"component", "module", "plugin", "template", "library", "package", "file"}
-                  if type_el.text.strip() not in valid_types:
-                      print(f"::error::{label}: invalid type '{type_el.text}' (expected: {valid_types})")
-                      errors += 1
-
-              # -- <version> format (XX.YY.ZZ with optional suffix) --
-              ver_el = u.find("version")
-              if ver_el is not None and ver_el.text:
-                  if not re.match(r"^\d{2}\.\d{2}\.\d{2}(-\w+)?$", ver_el.text.strip()):
-                      print(f"::warning::{label}: version '{ver_el.text}' does not match XX.YY.ZZ format")
-                      warnings += 1
-
-              # -- <maintainer> and <maintainerurl> --
-              for field in ["maintainer", "maintainerurl"]:
-                  el = u.find(field)
-                  if el is None or not (el.text or "").strip():
-                      print(f"::warning::{label}: missing <{field}>")
-                      warnings += 1
-
-              # -- Valid stability tag --
-              if tag is None:
-                  print(f"::error::{label}: missing <tags><tag>")
-                  errors += 1
-              elif tag not in VALID_TAGS:
-                  print(f"::error::{label}: invalid tag '{tag}' (expected: {VALID_TAGS})")
-                  errors += 1
-
-              # -- Duplicate tag check --
-              norm_tag = "dev" if tag == "development" else tag
-              if norm_tag in seen_tags:
-                  print(f"::error::{label}: duplicate channel '{tag}'")
-                  errors += 1
-              if norm_tag:
-                  seen_tags.add(norm_tag)
-
-          # -- All 5 channels must exist --
-          missing = REQUIRED_CHANNELS - seen_tags
-          if missing:
-              print(f"::error::Missing required update channels: {', '.join(sorted(missing))}")
-              errors += 1
-
-          # -- Version ordering: higher stability must not exceed dev version --
-          channel_versions = {}
-          for u in updates:
-              tag_el = u.find("tags/tag")
-              ver_el = u.find("version")
-              if tag_el is not None and ver_el is not None and tag_el.text and ver_el.text:
-                  norm = "dev" if tag_el.text.strip() == "development" else tag_el.text.strip()
-                  # Strip suffix for comparison (01.00.18-dev -> 01.00.18)
-                  base_ver = re.sub(r"-\w+$", "", ver_el.text.strip())
-                  channel_versions[norm] = base_ver
-
-          # Cascade check: dev >= alpha >= beta >= rc >= stable
-          ORDER = ["dev", "alpha", "beta", "rc", "stable"]
-          for j in range(1, len(ORDER)):
-              current = ORDER[j]
-              previous = ORDER[j - 1]
-              if current in channel_versions and previous in channel_versions:
-                  if channel_versions[current] > channel_versions[previous]:
-                      print(f"::error::{current} version ({channel_versions[current]}) is ahead of {previous} ({channel_versions[previous]})")
-                      errors += 1
-
-          # -- Summary --
-          print(f"\nupdates.xml validation: {len(updates)} entries, {errors} error(s), {warnings} warning(s)")
-          if errors > 0:
-              sys.exit(1)
-          PYEOF
-
      - name: Summary
        if: always()
        run: |
-          echo "## Joomla Update Server" >> $GITHUB_STEP_SUMMARY
+          VERSION="${{ steps.meta.outputs.version }}"
+          STABILITY="${{ steps.meta.outputs.stability }}"
+          DISPLAY="${{ steps.meta.outputs.display_version }}"
+          echo "## Update Server" >> $GITHUB_STEP_SUMMARY
          echo "" >> $GITHUB_STEP_SUMMARY
          echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY
          echo "|-------|-------|" >> $GITHUB_STEP_SUMMARY
          echo "| Stability | \`${STABILITY}\` |" >> $GITHUB_STEP_SUMMARY
-          echo "| Version | \`${DISPLAY_VERSION}\` |" >> $GITHUB_STEP_SUMMARY
-          echo "| Element | \`${EXT_ELEMENT}\` |" >> $GITHUB_STEP_SUMMARY
-          echo "| Download | [ZIP](${DOWNLOAD_URL}) |" >> $GITHUB_STEP_SUMMARY
+          echo "| Version | \`${DISPLAY}\` |" >> $GITHUB_STEP_SUMMARY
@@ -20,3 +20,38 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - Perfect Publisher Pro migration tool in installer script
 - Message template system with per-platform placeholders
 - Post queue with scheduled posting, retry logic, and delivery tracking
+- Core cross-posting engine: service plugin dispatch, duplicate guard, immediate execution
+- System plugin listens to both `onContentAfterSave` and `onContentChangeState` for publish events
+- Full admin templates: services list, post queue list, activity logs list, dashboard with recent activity
+- Service edit form with default/custom mode toggle and credential fields
+- Dashboard migration controller action for Perfect Publisher Pro import
+- Template placeholders: {title}, {url}, {introtext}, {fulltext}, {image}, {category}, {author}, {date}
+- Queue processing: Joomla Scheduled Task plugin (`plg_task_mokojoomcross`) — preferred method
+- Queue processing: Page-load fallback via system plugin `onAfterRender` with configurable throttle
+- Configurable processing method: scheduler-only (recommended), page-load only, or both
+- Dashboard warning banner when page-load processing is active instead of scheduler
+- Shared `QueueProcessor` helper with DB lock to prevent concurrent execution
+- Failed post retry with configurable max retries and delay
+- Automatic log cleanup based on configurable retention period
+- PP Pro migration rewritten: reads #__autotweet_channels table with credential mapping per service type
+- PP Pro migration fallback: extracts from component params when channel table missing
+- Plugin-level config forms for Telegram, Facebook, Discord, Slack (default bot tokens stored in plugin params)
+- Telegram plugin config: default bot token, parse mode, link preview toggle
+- Facebook plugin config: default page access token, default page ID
+- Discord plugin config: default webhook URL, embed color
+- Slack plugin config: default webhook URL
+- LinkedIn plugin config: OAuth client ID/secret, redirect URI
+- Mastodon plugin config: default instance URL, visibility, hashtags
+- Bluesky plugin config: default PDS URL, auto link cards
+- Mailchimp plugin config: default sender name/email, auto-send toggle
+- Template management: full CRUD with list/edit views, placeholder reference panel
+- Templates submenu item and dashboard quick link
+- Logs filter form with level and search filters
+- Admin component now has 5 submenu items: Dashboard, Post Queue, Services, Templates, Logs
+- Per-article cross-posting: skip toggle and service checkboxes in article editor attribs tab
+- Content plugin injects dynamic "Cross-Posting" fieldset via onContentPrepareForm
+- System plugin reads article attribs for mokojoomcross_services and mokojoomcross_skip
+- Analytics dashboard: posts-by-service table with success rates, top articles, daily trend data
+- OAuth helper: authorization URL generation, PKCE for Twitter, code exchange, token storage
+- OAuth controller: authorize and callback endpoints for Facebook, LinkedIn, Twitter
+- Wiki: Services guide, REST API reference, Message Templates, Troubleshooting
@@ -1,6 +1,6 @@
 # MokoJoomCross

-<!-- VERSION: 01.00.01-dev -->
+<!-- VERSION: 01.00.06-dev -->

 Cross-posting Joomla content to social media, email marketing, and chat platforms for Joomla 5/6.

@@ -51,4 +51,40 @@
            rows="4"
        />
    </fieldset>
+
+    <fieldset name="queue" label="COM_MOKOJOOMCROSS_CONFIG_QUEUE">
+        <field
+            name="queue_processing"
+            type="list"
+            label="COM_MOKOJOOMCROSS_CONFIG_QUEUE_PROCESSING"
+            description="COM_MOKOJOOMCROSS_CONFIG_QUEUE_PROCESSING_DESC"
+            default="scheduler">
+            <option value="scheduler">COM_MOKOJOOMCROSS_CONFIG_QUEUE_SCHEDULER</option>
+            <option value="pageload">COM_MOKOJOOMCROSS_CONFIG_QUEUE_PAGELOAD</option>
+            <option value="both">COM_MOKOJOOMCROSS_CONFIG_QUEUE_BOTH</option>
+        </field>
+
+        <field
+            name="pageload_client"
+            type="list"
+            label="COM_MOKOJOOMCROSS_CONFIG_PAGELOAD_CLIENT"
+            description="COM_MOKOJOOMCROSS_CONFIG_PAGELOAD_CLIENT_DESC"
+            default="both"
+            showon="queue_processing:pageload,both">
+            <option value="both">COM_MOKOJOOMCROSS_CONFIG_PAGELOAD_BOTH</option>
+            <option value="admin">COM_MOKOJOOMCROSS_CONFIG_PAGELOAD_ADMIN</option>
+            <option value="site">COM_MOKOJOOMCROSS_CONFIG_PAGELOAD_SITE</option>
+        </field>
+
+        <field
+            name="pageload_interval"
+            type="number"
+            label="COM_MOKOJOOMCROSS_CONFIG_PAGELOAD_INTERVAL"
+            description="COM_MOKOJOOMCROSS_CONFIG_PAGELOAD_INTERVAL_DESC"
+            default="300"
+            min="60"
+            max="3600"
+            showon="queue_processing:pageload,both"
+        />
+    </fieldset>
 </config>
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+    <fields name="filter">
+        <field
+            name="search"
+            type="text"
+            label="COM_MOKOJOOMCROSS_FILTER_SEARCH"
+            hint="JSEARCH_FILTER"
+        />
+
+        <field
+            name="level"
+            type="list"
+            label="COM_MOKOJOOMCROSS_FILTER_LEVEL"
+            onchange="this.form.submit();">
+            <option value="">COM_MOKOJOOMCROSS_SELECT_LEVEL</option>
+            <option value="info">Info</option>
+            <option value="warning">Warning</option>
+            <option value="error">Error</option>
+        </field>
+    </fields>
+
+    <fields name="list">
+        <field
+            name="fullordering"
+            type="list"
+            label="JGLOBAL_SORT_BY"
+            default="a.created DESC"
+            onchange="this.form.submit();">
+            <option value="">JGLOBAL_SORT_BY</option>
+            <option value="a.created ASC">COM_MOKOJOOMCROSS_CREATED_ASC</option>
+            <option value="a.created DESC">COM_MOKOJOOMCROSS_CREATED_DESC</option>
+            <option value="a.level ASC">COM_MOKOJOOMCROSS_LEVEL_ASC</option>
+            <option value="a.level DESC">COM_MOKOJOOMCROSS_LEVEL_DESC</option>
+        </field>
+    </fields>
+</form>
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+    <fields name="filter">
+        <field
+            name="search"
+            type="text"
+            label="COM_MOKOJOOMCROSS_FILTER_SEARCH"
+            hint="JSEARCH_FILTER"
+        />
+
+        <field
+            name="published"
+            type="status"
+            label="JOPTION_SELECT_PUBLISHED"
+            onchange="this.form.submit();">
+            <option value="">JOPTION_SELECT_PUBLISHED</option>
+        </field>
+
+        <field
+            name="service_type"
+            type="list"
+            label="COM_MOKOJOOMCROSS_FILTER_SERVICE_TYPE"
+            onchange="this.form.submit();">
+            <option value="">COM_MOKOJOOMCROSS_SELECT_SERVICE_TYPE</option>
+            <option value="default">Default</option>
+            <option value="facebook">Facebook</option>
+            <option value="twitter">X / Twitter</option>
+            <option value="linkedin">LinkedIn</option>
+            <option value="mastodon">Mastodon</option>
+            <option value="bluesky">Bluesky</option>
+            <option value="mailchimp">Mailchimp</option>
+            <option value="telegram">Telegram</option>
+            <option value="discord">Discord</option>
+            <option value="slack">Slack</option>
+        </field>
+    </fields>
+
+    <fields name="list">
+        <field
+            name="fullordering"
+            type="list"
+            label="JGLOBAL_SORT_BY"
+            default="a.ordering ASC"
+            onchange="this.form.submit();">
+            <option value="">JGLOBAL_SORT_BY</option>
+            <option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
+            <option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
+            <option value="a.ordering ASC">JGLOBAL_ORDERING_ASC</option>
+        </field>
+    </fields>
+</form>
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+    <fieldset name="details">
+        <field
+            name="id"
+            type="hidden"
+        />
+
+        <field
+            name="title"
+            type="text"
+            label="JGLOBAL_TITLE"
+            required="true"
+            size="40"
+        />
+
+        <field
+            name="service_type"
+            type="list"
+            label="COM_MOKOJOOMCROSS_FIELD_SERVICE_TYPE"
+            description="COM_MOKOJOOMCROSS_TEMPLATE_SERVICE_TYPE_DESC"
+            default="default">
+            <option value="default">COM_MOKOJOOMCROSS_TEMPLATE_TYPE_DEFAULT</option>
+            <option value="facebook">Facebook</option>
+            <option value="twitter">X / Twitter</option>
+            <option value="linkedin">LinkedIn</option>
+            <option value="mastodon">Mastodon</option>
+            <option value="bluesky">Bluesky</option>
+            <option value="mailchimp">Mailchimp</option>
+            <option value="telegram">Telegram</option>
+            <option value="discord">Discord</option>
+            <option value="slack">Slack</option>
+        </field>
+
+        <field
+            name="template_body"
+            type="textarea"
+            label="COM_MOKOJOOMCROSS_TEMPLATE_BODY"
+            description="COM_MOKOJOOMCROSS_TEMPLATE_BODY_DESC"
+            rows="10"
+            cols="60"
+            required="true"
+            filter="raw"
+        />
+
+        <field
+            name="published"
+            type="list"
+            label="JSTATUS"
+            default="1">
+            <option value="1">JPUBLISHED</option>
+            <option value="0">JUNPUBLISHED</option>
+        </field>
+
+        <field
+            name="ordering"
+            type="ordering"
+            label="JFIELD_ORDERING_LABEL"
+        />
+    </fieldset>
+</form>
@@ -58,3 +58,78 @@ COM_MOKOJOOMCROSS_CONFIG_LOG_RETENTION="Log Retention (days)"
 COM_MOKOJOOMCROSS_CONFIG_LOG_RETENTION_DESC="Number of days to keep activity logs"
 COM_MOKOJOOMCROSS_CONFIG_DEFAULT_TEMPLATE="Default Message Template"
 COM_MOKOJOOMCROSS_CONFIG_DEFAULT_TEMPLATE_DESC="Default template for cross-posts. Placeholders: {title}, {url}, {introtext}, {image}, {category}, {author}"
+
+; Table headings
+COM_MOKOJOOMCROSS_HEADING_STATUS="Status"
+COM_MOKOJOOMCROSS_HEADING_ARTICLE="Article"
+COM_MOKOJOOMCROSS_HEADING_SERVICE="Service"
+COM_MOKOJOOMCROSS_HEADING_MESSAGE="Message"
+COM_MOKOJOOMCROSS_HEADING_POSTED_AT="Posted"
+COM_MOKOJOOMCROSS_HEADING_CREATED="Created"
+COM_MOKOJOOMCROSS_HEADING_LEVEL="Level"
+COM_MOKOJOOMCROSS_HEADING_MODE="Mode"
+
+; Dashboard
+COM_MOKOJOOMCROSS_DASHBOARD_RECENT_ACTIVITY="Recent Activity"
+COM_MOKOJOOMCROSS_DASHBOARD_NO_RECENT="No recent activity."
+COM_MOKOJOOMCROSS_DASHBOARD_TOTAL_POSTS="Total Posts"
+COM_MOKOJOOMCROSS_DASHBOARD_PAGELOAD_WARNING_TITLE="Page-load queue processing is active"
+COM_MOKOJOOMCROSS_DASHBOARD_PAGELOAD_WARNING="You are using page-load processing for the cross-post queue. This is a fallback method and may be unreliable on low-traffic sites. For production use, switch to Joomla Scheduled Tasks: create a task of type <strong>MokoJoomCross - Process Queue</strong> in System → Scheduled Tasks, then set queue processing to <strong>Scheduler only</strong> in component options."
+
+; Queue Processing Configuration
+COM_MOKOJOOMCROSS_CONFIG_QUEUE="Queue Processing"
+COM_MOKOJOOMCROSS_CONFIG_QUEUE_PROCESSING="Processing Method"
+COM_MOKOJOOMCROSS_CONFIG_QUEUE_PROCESSING_DESC="How queued posts, retries, and scheduled posts are processed. Scheduler (recommended) uses Joomla's built-in Task Scheduler. Page-load piggybacks on page requests."
+COM_MOKOJOOMCROSS_CONFIG_QUEUE_SCHEDULER="Scheduler only (recommended)"
+COM_MOKOJOOMCROSS_CONFIG_QUEUE_PAGELOAD="Page-load only (fallback)"
+COM_MOKOJOOMCROSS_CONFIG_QUEUE_BOTH="Both (scheduler + page-load)"
+COM_MOKOJOOMCROSS_CONFIG_PAGELOAD_CLIENT="Page-load Client"
+COM_MOKOJOOMCROSS_CONFIG_PAGELOAD_CLIENT_DESC="Which Joomla application triggers page-load processing."
+COM_MOKOJOOMCROSS_CONFIG_PAGELOAD_BOTH="Backend and Frontend"
+COM_MOKOJOOMCROSS_CONFIG_PAGELOAD_ADMIN="Backend only"
+COM_MOKOJOOMCROSS_CONFIG_PAGELOAD_SITE="Frontend only"
+COM_MOKOJOOMCROSS_CONFIG_PAGELOAD_INTERVAL="Page-load Interval (seconds)"
+COM_MOKOJOOMCROSS_CONFIG_PAGELOAD_INTERVAL_DESC="Minimum seconds between page-load queue runs. Lower = more responsive but more DB queries per page load."
+
+; Submenu (extended)
+COM_MOKOJOOMCROSS_SUBMENU_TEMPLATES="Templates"
+
+; Template Management
+COM_MOKOJOOMCROSS_TEMPLATE_BODY="Template Body"
+COM_MOKOJOOMCROSS_TEMPLATE_BODY_DESC="Message template with placeholders. Use the reference panel on the right for available placeholders."
+COM_MOKOJOOMCROSS_TEMPLATE_SERVICE_TYPE_DESC="Which platform this template is for. 'Default' is the fallback when no platform-specific template exists."
+COM_MOKOJOOMCROSS_TEMPLATE_TYPE_DEFAULT="Default (fallback)"
+COM_MOKOJOOMCROSS_TEMPLATE_PREVIEW="Preview"
+COM_MOKOJOOMCROSS_TEMPLATE_PLACEHOLDERS="Available Placeholders"
+
+; Placeholders
+COM_MOKOJOOMCROSS_PLACEHOLDER_TITLE="Article title"
+COM_MOKOJOOMCROSS_PLACEHOLDER_URL="Article URL"
+COM_MOKOJOOMCROSS_PLACEHOLDER_INTROTEXT="Intro text (280 chars, no HTML)"
+COM_MOKOJOOMCROSS_PLACEHOLDER_FULLTEXT="Full text (500 chars, no HTML)"
+COM_MOKOJOOMCROSS_PLACEHOLDER_IMAGE="Intro image URL"
+COM_MOKOJOOMCROSS_PLACEHOLDER_CATEGORY="Category name"
+COM_MOKOJOOMCROSS_PLACEHOLDER_AUTHOR="Author name"
+COM_MOKOJOOMCROSS_PLACEHOLDER_DATE="Publish date (YYYY-MM-DD)"
+
+; Logs
+COM_MOKOJOOMCROSS_FILTER_LEVEL="Level"
+COM_MOKOJOOMCROSS_SELECT_LEVEL="- Select Level -"
+COM_MOKOJOOMCROSS_LEVEL_ASC="Level ascending"
+COM_MOKOJOOMCROSS_LEVEL_DESC="Level descending"
+
+; Analytics Dashboard
+COM_MOKOJOOMCROSS_DASHBOARD_SERVICE_BREAKDOWN="Posts by Service"
+COM_MOKOJOOMCROSS_DASHBOARD_TOP_ARTICLES="Most Cross-Posted Articles"
+COM_MOKOJOOMCROSS_DASHBOARD_SUCCESS_RATE="Success Rate"
+
+; OAuth
+COM_MOKOJOOMCROSS_OAUTH_NO_SERVICE="No service specified for OAuth authorization."
+COM_MOKOJOOMCROSS_OAUTH_SERVICE_NOT_FOUND="Service not found."
+COM_MOKOJOOMCROSS_OAUTH_NO_CLIENT_ID="No OAuth Client ID configured for %s. Set it in Extensions → Plugins → MokoJoomCross - %s."
+COM_MOKOJOOMCROSS_OAUTH_NOT_SUPPORTED="OAuth is not supported for %s."
+COM_MOKOJOOMCROSS_OAUTH_PLATFORM_ERROR="Platform returned error: %s"
+COM_MOKOJOOMCROSS_OAUTH_INVALID_CALLBACK="Invalid OAuth callback — missing code or state."
+COM_MOKOJOOMCROSS_OAUTH_INVALID_STATE="Invalid OAuth state parameter."
+COM_MOKOJOOMCROSS_OAUTH_TOKEN_ERROR="Token exchange failed: %s"
+COM_MOKOJOOMCROSS_OAUTH_SUCCESS="%s connected successfully! Access token stored."
@@ -7,4 +7,5 @@ COM_MOKOJOOMCROSS_DESCRIPTION="Cross-posting Joomla content to social media, ema
 COM_MOKOJOOMCROSS_SUBMENU_DASHBOARD="Dashboard"
 COM_MOKOJOOMCROSS_SUBMENU_POSTS="Post Queue"
 COM_MOKOJOOMCROSS_SUBMENU_SERVICES="Services"
+COM_MOKOJOOMCROSS_SUBMENU_TEMPLATES="Templates"
 COM_MOKOJOOMCROSS_SUBMENU_LOGS="Activity Logs"
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="component" method="upgrade">
    <name>com_mokojoomcross</name>
-    <version>01.00.01-dev</version>
+    <version>01.00.06-dev-dev</version>
    <creationDate>2026-05-28</creationDate>
    <author>Moko Consulting</author>
    <authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -48,6 +48,7 @@
            <menu link="option=com_mokojoomcross&amp;view=dashboard">COM_MOKOJOOMCROSS_SUBMENU_DASHBOARD</menu>
            <menu link="option=com_mokojoomcross&amp;view=posts">COM_MOKOJOOMCROSS_SUBMENU_POSTS</menu>
            <menu link="option=com_mokojoomcross&amp;view=services">COM_MOKOJOOMCROSS_SUBMENU_SERVICES</menu>
+            <menu link="option=com_mokojoomcross&amp;view=templates">COM_MOKOJOOMCROSS_SUBMENU_TEMPLATES</menu>
            <menu link="option=com_mokojoomcross&amp;view=logs">COM_MOKOJOOMCROSS_SUBMENU_LOGS</menu>
        </submenu>
        <files>
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * @package     MokoJoomCross
+ * @subpackage  com_mokojoomcross
+ * @author      Moko Consulting <hello@mokoconsulting.tech>
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+namespace Joomla\Component\MokoJoomCross\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Router\Route;
+use Joomla\Component\MokoJoomCross\Administrator\Helper\MigrationHelper;
+
+class DashboardController extends BaseController
+{
+    /**
+     * Run Perfect Publisher Pro migration.
+     *
+     * @return  void
+     */
+    public function migrate(): void
+    {
+        // Check ACL
+        if (!$this->app->getIdentity()->authorise('mokojoomcross.migrate', 'com_mokojoomcross')) {
+            $this->setRedirect(
+                Route::_('index.php?option=com_mokojoomcross&view=dashboard', false),
+                Text::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'),
+                'error'
+            );
+
+            return;
+        }
+
+        $result = MigrationHelper::migrate();
+
+        if (!empty($result['errors'])) {
+            $this->setRedirect(
+                Route::_('index.php?option=com_mokojoomcross&view=dashboard', false),
+                Text::sprintf('COM_MOKOJOOMCROSS_MIGRATION_ERROR', implode('; ', $result['errors'])),
+                'error'
+            );
+
+            return;
+        }
+
+        $this->setRedirect(
+            Route::_('index.php?option=com_mokojoomcross&view=dashboard', false),
+            Text::sprintf('COM_MOKOJOOMCROSS_MIGRATION_SUCCESS', $result['migrated'], $result['skipped']),
+            'success'
+        );
+    }
+}
@@ -0,0 +1,175 @@
+<?php
+
+/**
+ * @package     MokoJoomCross
+ * @subpackage  com_mokojoomcross
+ * @author      Moko Consulting <hello@mokoconsulting.tech>
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+namespace Joomla\Component\MokoJoomCross\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\BaseController;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\Component\MokoJoomCross\Administrator\Helper\OAuthHelper;
+
+/**
+ * OAuth controller for handling browser-based authorization flows.
+ *
+ * Endpoints:
+ *   task=oauth.authorize  — Initiate OAuth flow (redirect to platform)
+ *   task=oauth.callback   — Handle platform redirect with auth code
+ */
+class OauthController extends BaseController
+{
+    /**
+     * Initiate OAuth authorization for a service.
+     *
+     * Expects: service_id (int) in request
+     */
+    public function authorize(): void
+    {
+        $serviceId = $this->input->getInt('service_id', 0);
+
+        if (!$serviceId) {
+            $this->setRedirect(
+                Route::_('index.php?option=com_mokojoomcross&view=services', false),
+                Text::_('COM_MOKOJOOMCROSS_OAUTH_NO_SERVICE'),
+                'error'
+            );
+
+            return;
+        }
+
+        $db = \Joomla\CMS\Factory::getDbo();
+
+        $query = $db->getQuery(true)
+            ->select('*')
+            ->from($db->quoteName('#__mokojoomcross_services'))
+            ->where($db->quoteName('id') . ' = ' . $serviceId);
+
+        $db->setQuery($query);
+        $service = $db->loadObject();
+
+        if (!$service) {
+            $this->setRedirect(
+                Route::_('index.php?option=com_mokojoomcross&view=services', false),
+                Text::_('COM_MOKOJOOMCROSS_OAUTH_SERVICE_NOT_FOUND'),
+                'error'
+            );
+
+            return;
+        }
+
+        // Get client ID from plugin params
+        PluginHelper::importPlugin('mokojoomcross');
+        $pluginParams = PluginHelper::getPlugin('mokojoomcross', $service->service_type);
+        $params = json_decode($pluginParams->params ?? '{}', true) ?: [];
+
+        $clientId = $params['client_id'] ?? '';
+
+        if (empty($clientId)) {
+            $this->setRedirect(
+                Route::_('index.php?option=com_mokojoomcross&view=services', false),
+                Text::sprintf('COM_MOKOJOOMCROSS_OAUTH_NO_CLIENT_ID', ucfirst($service->service_type)),
+                'error'
+            );
+
+            return;
+        }
+
+        $url = OAuthHelper::getAuthorizeUrl($service->service_type, $serviceId, $clientId);
+
+        if (!$url) {
+            $this->setRedirect(
+                Route::_('index.php?option=com_mokojoomcross&view=services', false),
+                Text::sprintf('COM_MOKOJOOMCROSS_OAUTH_NOT_SUPPORTED', ucfirst($service->service_type)),
+                'error'
+            );
+
+            return;
+        }
+
+        $this->app->redirect($url);
+    }
+
+    /**
+     * Handle OAuth callback from platform.
+     *
+     * Expects: code (string), state (base64 JSON with service_id)
+     */
+    public function callback(): void
+    {
+        $code  = $this->input->getString('code', '');
+        $state = $this->input->getString('state', '');
+        $error = $this->input->getString('error', '');
+
+        if ($error) {
+            $this->setRedirect(
+                Route::_('index.php?option=com_mokojoomcross&view=services', false),
+                Text::sprintf('COM_MOKOJOOMCROSS_OAUTH_PLATFORM_ERROR', $error),
+                'error'
+            );
+
+            return;
+        }
+
+        if (empty($code) || empty($state)) {
+            $this->setRedirect(
+                Route::_('index.php?option=com_mokojoomcross&view=services', false),
+                Text::_('COM_MOKOJOOMCROSS_OAUTH_INVALID_CALLBACK'),
+                'error'
+            );
+
+            return;
+        }
+
+        $stateData = json_decode(base64_decode($state), true);
+        $serviceId   = (int) ($stateData['service_id'] ?? 0);
+        $serviceType = $stateData['type'] ?? '';
+
+        if (!$serviceId || !$serviceType) {
+            $this->setRedirect(
+                Route::_('index.php?option=com_mokojoomcross&view=services', false),
+                Text::_('COM_MOKOJOOMCROSS_OAUTH_INVALID_STATE'),
+                'error'
+            );
+
+            return;
+        }
+
+        // Get client credentials from plugin params
+        PluginHelper::importPlugin('mokojoomcross');
+        $pluginParams = PluginHelper::getPlugin('mokojoomcross', $serviceType);
+        $params = json_decode($pluginParams->params ?? '{}', true) ?: [];
+
+        $clientId     = $params['client_id'] ?? '';
+        $clientSecret = $params['client_secret'] ?? '';
+
+        $tokenData = OAuthHelper::exchangeCode($serviceType, $code, $clientId, $clientSecret);
+
+        if (!empty($tokenData['error'])) {
+            $this->setRedirect(
+                Route::_('index.php?option=com_mokojoomcross&task=service.edit&id=' . $serviceId, false),
+                Text::sprintf('COM_MOKOJOOMCROSS_OAUTH_TOKEN_ERROR', $tokenData['error']),
+                'error'
+            );
+
+            return;
+        }
+
+        OAuthHelper::storeToken($serviceId, $tokenData);
+
+        $this->setRedirect(
+            Route::_('index.php?option=com_mokojoomcross&task=service.edit&id=' . $serviceId, false),
+            Text::sprintf('COM_MOKOJOOMCROSS_OAUTH_SUCCESS', ucfirst($serviceType)),
+            'success'
+        );
+    }
+}
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @package     MokoJoomCross
+ * @subpackage  com_mokojoomcross
+ * @author      Moko Consulting <hello@mokoconsulting.tech>
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+namespace Joomla\Component\MokoJoomCross\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Controller\FormController;
+
+class TemplateController extends FormController
+{
+}
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * @package     MokoJoomCross
+ * @subpackage  com_mokojoomcross
+ * @author      Moko Consulting <hello@mokoconsulting.tech>
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+namespace Joomla\Component\MokoJoomCross\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Controller\AdminController;
+
+class TemplatesController extends AdminController
+{
+    public function getModel($name = 'Template', $prefix = 'Administrator', $config = ['ignore_request' => true])
+    {
+        return parent::getModel($name, $prefix, $config);
+    }
+}
@@ -16,28 +16,42 @@ defined('_JEXEC') or die;
 use Joomla\CMS\Factory;

 /**
- * Migration helper for importing settings from Perfect Publisher Pro.
+ * Migration helper for importing settings from Perfect Publisher Pro (com_autotweet).
 *
- * Reads Perfect Publisher Pro's component params and plugin configurations
- * and maps them to MokoJoomCross service records.
+ * PP Pro stores channels in #__autotweet_channels with a channeltype_id FK
+ * to #__autotweet_channeltypes. Each channel has a JSON params column
+ * containing OAuth tokens, API keys, webhook URLs, etc.
+ *
+ * This helper reads those channels and creates MokoJoomCross service records.
 */
 class MigrationHelper
 {
    /**
-     * Service type mapping from Perfect Publisher Pro to MokoJoomCross.
-     *
-     * @var array
+     * Channel type name → MokoJoomCross service type mapping.
+     * PP Pro channeltype names vary; we match common patterns.
     */
-    private const SERVICE_MAP = [
-        'facebook'  => 'facebook',
-        'twitter'   => 'twitter',
-        'linkedin'  => 'linkedin',
-        'telegram'  => 'telegram',
+    private const CHANNEL_MAP = [
+        'facebook'    => 'facebook',
+        'fb'          => 'facebook',
+        'twitter'     => 'twitter',
+        'tw'          => 'twitter',
+        'linkedin'    => 'linkedin',
+        'li'          => 'linkedin',
+        'telegram'    => 'telegram',
+        'tg'          => 'telegram',
+        'discord'     => 'discord',
+        'slack'       => 'slack',
+        'mastodon'    => 'mastodon',
    ];

    /**
     * Run the full migration from Perfect Publisher Pro.
     *
+     * Strategy:
+     *   1. Try reading #__autotweet_channels (PP Pro's channel table)
+     *   2. Fall back to reading component params if table doesn't exist
+     *   3. Create disabled MokoJoomCross service records
+     *
     * @return  array  ['migrated' => int, 'skipped' => int, 'errors' => string[]]
     */
    public static function migrate(): array
@@ -45,44 +59,106 @@ class MigrationHelper
        $db = Factory::getDbo();
        $result = ['migrated' => 0, 'skipped' => 0, 'errors' => []];

-        // Read Perfect Publisher Pro component params
+        // Check if PP Pro is installed
+        if (!self::isPPProInstalled($db)) {
+            $result['errors'][] = 'Perfect Publisher Pro (com_autotweet) is not installed.';
+
+            return $result;
+        }
+
+        // Try channel-based migration first (PP Pro stores configs in #__autotweet_channels)
+        if (self::hasChannelTable($db)) {
+            $result = self::migrateFromChannels($db, $result);
+        } else {
+            // Fall back to component params extraction
+            $result = self::migrateFromParams($db, $result);
+        }
+
+        // Clear migration flag from MokoJoomCross params
+        self::clearMigrationFlag($db);
+
+        return $result;
+    }
+
+    /**
+     * Check if PP Pro is installed.
+     */
+    private static function isPPProInstalled($db): bool
+    {
        $query = $db->getQuery(true)
-            ->select($db->quoteName('params'))
+            ->select('COUNT(*)')
            ->from($db->quoteName('#__extensions'))
-            ->where($db->quoteName('element') . ' LIKE ' . $db->quote('%perfectpublisher%'))
+            ->where('(' . $db->quoteName('element') . ' = ' . $db->quote('com_autotweet')
+                . ' OR ' . $db->quoteName('element') . ' LIKE ' . $db->quote('%perfectpublisher%') . ')')
            ->where($db->quoteName('type') . ' = ' . $db->quote('component'));

        $db->setQuery($query);
-        $rawParams = $db->loadResult();

-        if (!$rawParams) {
-            $result['errors'][] = 'Perfect Publisher Pro not found or has no configuration.';
+        return (int) $db->loadResult() > 0;
+    }
+
+    /**
+     * Check if the autotweet_channels table exists.
+     */
+    private static function hasChannelTable($db): bool
+    {
+        $prefix = $db->getPrefix();
+
+        try {
+            $db->setQuery('SHOW TABLES LIKE ' . $db->quote($prefix . 'autotweet_channels'));
+
+            return !empty($db->loadResult());
+        } catch (\Throwable $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Migrate from #__autotweet_channels table (primary method).
+     */
+    private static function migrateFromChannels($db, array $result): array
+    {
+        // Load channels with their type names
+        $query = $db->getQuery(true)
+            ->select('c.id, c.name, c.published, c.params')
+            ->select($db->quoteName('ct.name', 'type_name'))
+            ->from($db->quoteName('#__autotweet_channels', 'c'))
+            ->join('LEFT', $db->quoteName('#__autotweet_channeltypes', 'ct')
+                . ' ON ' . $db->quoteName('ct.id') . ' = ' . $db->quoteName('c.channeltype_id'));
+
+        $db->setQuery($query);
+        $channels = $db->loadObjectList();
+
+        if (empty($channels)) {
+            $result['errors'][] = 'No channels found in Perfect Publisher Pro.';

            return $result;
        }

-        $params = json_decode($rawParams, true);
+        foreach ($channels as $channel) {
+            $typeName = strtolower(trim($channel->type_name ?? ''));

-        if (!is_array($params)) {
-            $result['errors'][] = 'Could not parse Perfect Publisher Pro configuration.';
+            // Match to MokoJoomCross service type
+            $mjcType = null;

-            return $result;
-        }
+            foreach (self::CHANNEL_MAP as $pattern => $serviceType) {
+                if (str_contains($typeName, $pattern)) {
+                    $mjcType = $serviceType;
+                    break;
+                }
+            }

-        // Iterate known service mappings and create MokoJoomCross service records
-        foreach (self::SERVICE_MAP as $ppKey => $mjcType) {
-            $credentials = self::extractCredentials($params, $ppKey);
-
-            if (empty($credentials)) {
+            if (!$mjcType) {
                $result['skipped']++;
                continue;
            }

-            // Check if service already exists
+            // Check for duplicate (same type + migrated alias)
+            $alias = $mjcType . '-pp-' . $channel->id;
            $query = $db->getQuery(true)
                ->select('COUNT(*)')
                ->from($db->quoteName('#__mokojoomcross_services'))
-                ->where($db->quoteName('service_type') . ' = ' . $db->quote($mjcType));
+                ->where($db->quoteName('alias') . ' = ' . $db->quote($alias));
            $db->setQuery($query);

            if ((int) $db->loadResult() > 0) {
@@ -90,60 +166,223 @@ class MigrationHelper
                continue;
            }

-            // Insert new service record
+            // Parse channel params to extract credentials
+            $channelParams = json_decode($channel->params ?: '{}', true) ?: [];
+            $credentials = self::mapChannelCredentials($mjcType, $channelParams);
+
+            if (empty($credentials)) {
+                $result['skipped']++;
+                continue;
+            }
+
+            // Create MokoJoomCross service record
            $service = (object) [
-                'title'        => ucfirst($mjcType) . ' (migrated from PP Pro)',
-                'alias'        => $mjcType . '-migrated',
+                'title'        => $channel->name ?: ucfirst($mjcType) . ' (PP Pro #' . $channel->id . ')',
+                'alias'        => $alias,
                'service_type' => $mjcType,
                'credentials'  => json_encode($credentials),
                'params'       => '{}',
-                'published'    => 0, // Disabled until user verifies
+                'published'    => 0, // Disabled — user must verify before enabling
                'ordering'     => 0,
                'created'      => Factory::getDate()->toSql(),
                'modified'     => Factory::getDate()->toSql(),
                'created_by'   => Factory::getApplication()->getIdentity()->id ?? 0,
            ];

-            $db->insertObject('#__mokojoomcross_services', $service);
-            $result['migrated']++;
+            try {
+                $db->insertObject('#__mokojoomcross_services', $service);
+                $result['migrated']++;
+            } catch (\Throwable $e) {
+                $result['errors'][] = sprintf('Failed to create %s service: %s', $mjcType, $e->getMessage());
+            }
        }

-        // Clear migration flag
-        $query = $db->getQuery(true)
-            ->update($db->quoteName('#__extensions'))
-            ->set($db->quoteName('params') . ' = ' . $db->quote('{}'))
-            ->where($db->quoteName('type') . ' = ' . $db->quote('component'))
-            ->where($db->quoteName('element') . ' = ' . $db->quote('com_mokojoomcross'));
-        $db->setQuery($query);
-        $db->execute();
-
        return $result;
    }

    /**
-     * Extract credentials for a specific service from PP Pro params.
+     * Map PP Pro channel params to MokoJoomCross credential format.
     *
-     * @param   array   $params     PP Pro component params
-     * @param   string  $serviceKey Service key in PP Pro params
-     *
-     * @return  array  Credential key/value pairs (empty if none found)
+     * PP Pro stores various keys in channel params depending on the type.
+     * We normalize them to MokoJoomCross's expected credential structure.
     */
-    private static function extractCredentials(array $params, string $serviceKey): array
+    private static function mapChannelCredentials(string $serviceType, array $channelParams): array
    {
-        $credentials = [];
+        $creds = ['mode' => 'custom'];

-        // PP Pro uses various key patterns: {service}_app_id, {service}_api_key, etc.
-        $prefixes = [$serviceKey . '_', $serviceKey . 'api_', $serviceKey . '-'];
+        // Common OAuth fields PP Pro uses
+        $oauthFields = ['access_token', 'access_secret', 'client_id', 'client_secret',
+                        'api_key', 'api_secret', 'app_id', 'app_secret', 'token'];

-        foreach ($params as $key => $value) {
-            foreach ($prefixes as $prefix) {
-                if (str_starts_with($key, $prefix) && !empty($value)) {
-                    $cleanKey = str_replace($prefix, '', $key);
-                    $credentials[$cleanKey] = $value;
+        switch ($serviceType) {
+            case 'facebook':
+                $creds['page_access_token'] = $channelParams['access_token'] ?? $channelParams['token'] ?? '';
+                $creds['page_id']           = $channelParams['page_id'] ?? $channelParams['pageid'] ?? '';
+                break;
+
+            case 'twitter':
+                $creds['bearer_token']       = $channelParams['bearer_token'] ?? '';
+                $creds['api_key']            = $channelParams['api_key'] ?? $channelParams['consumer_key'] ?? '';
+                $creds['api_secret']         = $channelParams['api_secret'] ?? $channelParams['consumer_secret'] ?? '';
+                $creds['access_token']       = $channelParams['access_token'] ?? '';
+                $creds['access_token_secret'] = $channelParams['access_secret'] ?? $channelParams['access_token_secret'] ?? '';
+                break;
+
+            case 'linkedin':
+                $creds['access_token']   = $channelParams['access_token'] ?? $channelParams['token'] ?? '';
+                $creds['organization_id'] = $channelParams['company_id'] ?? $channelParams['organization_id'] ?? '';
+                $creds['person_id']      = $channelParams['person_id'] ?? $channelParams['member_id'] ?? '';
+                break;
+
+            case 'telegram':
+                $creds['bot_token'] = $channelParams['bot_token'] ?? $channelParams['token'] ?? $channelParams['api_key'] ?? '';
+                $creds['chat_id']   = $channelParams['chat_id'] ?? $channelParams['channel_id'] ?? '';
+                break;
+
+            case 'discord':
+                $creds['webhook_url'] = $channelParams['webhook_url'] ?? $channelParams['webhook'] ?? '';
+                break;
+
+            case 'slack':
+                $creds['webhook_url'] = $channelParams['webhook_url'] ?? $channelParams['webhook'] ?? '';
+                break;
+
+            case 'mastodon':
+                $creds['instance_url']  = $channelParams['instance_url'] ?? $channelParams['server'] ?? '';
+                $creds['access_token']  = $channelParams['access_token'] ?? $channelParams['token'] ?? '';
+                break;
+
+            default:
+                // Generic: copy all non-empty params
+                foreach ($channelParams as $key => $value) {
+                    if (!empty($value) && is_string($value)) {
+                        $creds[$key] = $value;
+                    }
                }
+        }
+
+        // Remove empty credential values and the mode key for check
+        $check = array_filter($creds, fn($v, $k) => $k !== 'mode' && !empty($v), ARRAY_FILTER_USE_BOTH);
+
+        return empty($check) ? [] : $creds;
+    }
+
+    /**
+     * Fallback: migrate from component params when channel table doesn't exist.
+     */
+    private static function migrateFromParams($db, array $result): array
+    {
+        $query = $db->getQuery(true)
+            ->select($db->quoteName('params'))
+            ->from($db->quoteName('#__extensions'))
+            ->where('(' . $db->quoteName('element') . ' = ' . $db->quote('com_autotweet')
+                . ' OR ' . $db->quoteName('element') . ' LIKE ' . $db->quote('%perfectpublisher%') . ')')
+            ->where($db->quoteName('type') . ' = ' . $db->quote('component'));
+
+        $db->setQuery($query);
+        $rawParams = $db->loadResult();
+
+        if (!$rawParams) {
+            $result['errors'][] = 'No PP Pro configuration found.';
+
+            return $result;
+        }
+
+        $params = json_decode($rawParams, true);
+
+        if (!is_array($params)) {
+            $result['errors'][] = 'Could not parse PP Pro configuration.';
+
+            return $result;
+        }
+
+        // Extract services from component params using prefix patterns
+        $servicePatterns = [
+            'facebook'  => ['facebook_', 'fb_'],
+            'twitter'   => ['twitter_', 'tw_'],
+            'linkedin'  => ['linkedin_', 'li_'],
+            'telegram'  => ['telegram_', 'tg_'],
+        ];
+
+        foreach ($servicePatterns as $mjcType => $prefixes) {
+            $credentials = ['mode' => 'custom'];
+            $found = false;
+
+            foreach ($params as $key => $value) {
+                foreach ($prefixes as $prefix) {
+                    if (str_starts_with($key, $prefix) && !empty($value)) {
+                        $cleanKey = substr($key, strlen($prefix));
+                        $credentials[$cleanKey] = $value;
+                        $found = true;
+                    }
+                }
+            }
+
+            if (!$found) {
+                $result['skipped']++;
+                continue;
+            }
+
+            // Duplicate check
+            $query = $db->getQuery(true)
+                ->select('COUNT(*)')
+                ->from($db->quoteName('#__mokojoomcross_services'))
+                ->where($db->quoteName('service_type') . ' = ' . $db->quote($mjcType))
+                ->where($db->quoteName('alias') . ' LIKE ' . $db->quote('%-migrated%'));
+            $db->setQuery($query);
+
+            if ((int) $db->loadResult() > 0) {
+                $result['skipped']++;
+                continue;
+            }
+
+            $service = (object) [
+                'title'        => ucfirst($mjcType) . ' (migrated from PP Pro)',
+                'alias'        => $mjcType . '-migrated',
+                'service_type' => $mjcType,
+                'credentials'  => json_encode($credentials),
+                'params'       => '{}',
+                'published'    => 0,
+                'ordering'     => 0,
+                'created'      => Factory::getDate()->toSql(),
+                'modified'     => Factory::getDate()->toSql(),
+                'created_by'   => Factory::getApplication()->getIdentity()->id ?? 0,
+            ];
+
+            try {
+                $db->insertObject('#__mokojoomcross_services', $service);
+                $result['migrated']++;
+            } catch (\Throwable $e) {
+                $result['errors'][] = sprintf('Failed to create %s: %s', $mjcType, $e->getMessage());
            }
        }

-        return $credentials;
+        return $result;
+    }
+
+    /**
+     * Clear the migration flag from MokoJoomCross component params.
+     */
+    private static function clearMigrationFlag($db): void
+    {
+        $query = $db->getQuery(true)
+            ->select($db->quoteName('params'))
+            ->from($db->quoteName('#__extensions'))
+            ->where($db->quoteName('type') . ' = ' . $db->quote('component'))
+            ->where($db->quoteName('element') . ' = ' . $db->quote('com_mokojoomcross'));
+
+        $db->setQuery($query);
+        $params = json_decode($db->loadResult() ?: '{}', true) ?: [];
+
+        unset($params['migration_available'], $params['migration_source_params']);
+
+        $query = $db->getQuery(true)
+            ->update($db->quoteName('#__extensions'))
+            ->set($db->quoteName('params') . ' = ' . $db->quote(json_encode($params)))
+            ->where($db->quoteName('type') . ' = ' . $db->quote('component'))
+            ->where($db->quoteName('element') . ' = ' . $db->quote('com_mokojoomcross'));
+
+        $db->setQuery($query);
+        $db->execute();
    }
 }
@@ -0,0 +1,204 @@
+<?php
+
+/**
+ * @package     MokoJoomCross
+ * @subpackage  com_mokojoomcross
+ * @author      Moko Consulting <hello@mokoconsulting.tech>
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+namespace Joomla\Component\MokoJoomCross\Administrator\Helper;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Uri\Uri;
+
+/**
+ * OAuth helper for services requiring browser-based authorization.
+ *
+ * Handles the OAuth 2.0 authorization code flow:
+ *   1. Generate authorize URL → redirect user to platform
+ *   2. Platform redirects back with auth code
+ *   3. Exchange code for access token
+ *   4. Store token in service credentials
+ *
+ * Each platform has its own endpoints and scopes. The service plugin
+ * provides these via OAuthConfigInterface (if it supports OAuth).
+ */
+class OAuthHelper
+{
+    /**
+     * OAuth endpoint configs per service type.
+     */
+    private const OAUTH_CONFIGS = [
+        'facebook' => [
+            'authorize_url' => 'https://www.facebook.com/v19.0/dialog/oauth',
+            'token_url'     => 'https://graph.facebook.com/v19.0/oauth/access_token',
+            'scopes'        => 'pages_manage_posts,pages_read_engagement',
+        ],
+        'linkedin' => [
+            'authorize_url' => 'https://www.linkedin.com/oauth/v2/authorization',
+            'token_url'     => 'https://www.linkedin.com/oauth/v2/accessToken',
+            'scopes'        => 'w_member_social',
+        ],
+        'twitter' => [
+            'authorize_url' => 'https://twitter.com/i/oauth2/authorize',
+            'token_url'     => 'https://api.twitter.com/2/oauth2/token',
+            'scopes'        => 'tweet.read tweet.write users.read',
+        ],
+    ];
+
+    /**
+     * Build the authorization URL for a given service.
+     *
+     * @param   string  $serviceType  Service type (facebook, linkedin, twitter)
+     * @param   int     $serviceId    Service record ID (passed through state param)
+     * @param   string  $clientId     OAuth client/app ID
+     *
+     * @return  string|null  Authorization URL or null if not supported
+     */
+    public static function getAuthorizeUrl(string $serviceType, int $serviceId, string $clientId): ?string
+    {
+        $config = self::OAUTH_CONFIGS[$serviceType] ?? null;
+
+        if (!$config) {
+            return null;
+        }
+
+        $redirectUri = self::getCallbackUrl();
+        $state       = base64_encode(json_encode(['service_id' => $serviceId, 'type' => $serviceType]));
+
+        $params = [
+            'client_id'     => $clientId,
+            'redirect_uri'  => $redirectUri,
+            'response_type' => 'code',
+            'scope'         => $config['scopes'],
+            'state'         => $state,
+        ];
+
+        // Twitter uses PKCE
+        if ($serviceType === 'twitter') {
+            $verifier = bin2hex(random_bytes(32));
+            $challenge = rtrim(strtr(base64_encode(hash('sha256', $verifier, true)), '+/', '-_'), '=');
+
+            // Store verifier in session for token exchange
+            Factory::getApplication()->getSession()->set('mokojoomcross.pkce_verifier', $verifier);
+
+            $params['code_challenge']        = $challenge;
+            $params['code_challenge_method'] = 'S256';
+        }
+
+        return $config['authorize_url'] . '?' . http_build_query($params);
+    }
+
+    /**
+     * Exchange authorization code for access token.
+     *
+     * @param   string  $serviceType   Service type
+     * @param   string  $code          Authorization code from callback
+     * @param   string  $clientId      OAuth client ID
+     * @param   string  $clientSecret  OAuth client secret
+     *
+     * @return  array  ['access_token' => '...', 'expires_in' => N, ...] or ['error' => '...']
+     */
+    public static function exchangeCode(string $serviceType, string $code, string $clientId, string $clientSecret): array
+    {
+        $config = self::OAUTH_CONFIGS[$serviceType] ?? null;
+
+        if (!$config) {
+            return ['error' => 'Unsupported service type for OAuth'];
+        }
+
+        $postData = [
+            'grant_type'    => 'authorization_code',
+            'code'          => $code,
+            'redirect_uri'  => self::getCallbackUrl(),
+            'client_id'     => $clientId,
+            'client_secret' => $clientSecret,
+        ];
+
+        // Twitter PKCE
+        if ($serviceType === 'twitter') {
+            $verifier = Factory::getApplication()->getSession()->get('mokojoomcross.pkce_verifier', '');
+            $postData['code_verifier'] = $verifier;
+        }
+
+        $ch = curl_init($config['token_url']);
+        curl_setopt_array($ch, [
+            CURLOPT_POST           => true,
+            CURLOPT_POSTFIELDS     => http_build_query($postData),
+            CURLOPT_HTTPHEADER     => ['Content-Type: application/x-www-form-urlencoded', 'Accept: application/json'],
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_TIMEOUT        => 30,
+        ]);
+
+        $response = curl_exec($ch);
+        $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        curl_close($ch);
+
+        $data = json_decode($response, true) ?: [];
+
+        if ($httpCode >= 200 && $httpCode < 300 && !empty($data['access_token'])) {
+            return $data;
+        }
+
+        return ['error' => $data['error_description'] ?? $data['error'] ?? 'Token exchange failed'];
+    }
+
+    /**
+     * Store OAuth token in the service credentials.
+     *
+     * @param   int    $serviceId    Service record ID
+     * @param   array  $tokenData    Token response from platform
+     *
+     * @return  bool
+     */
+    public static function storeToken(int $serviceId, array $tokenData): bool
+    {
+        $db = Factory::getDbo();
+
+        $query = $db->getQuery(true)
+            ->select($db->quoteName('credentials'))
+            ->from($db->quoteName('#__mokojoomcross_services'))
+            ->where($db->quoteName('id') . ' = ' . $serviceId);
+
+        $db->setQuery($query);
+        $credentials = json_decode($db->loadResult() ?: '{}', true) ?: [];
+
+        $credentials['access_token'] = $tokenData['access_token'];
+        $credentials['mode']         = 'custom';
+
+        if (!empty($tokenData['refresh_token'])) {
+            $credentials['refresh_token'] = $tokenData['refresh_token'];
+        }
+
+        if (!empty($tokenData['expires_in'])) {
+            $credentials['token_expires'] = time() + (int) $tokenData['expires_in'];
+        }
+
+        $query = $db->getQuery(true)
+            ->update($db->quoteName('#__mokojoomcross_services'))
+            ->set($db->quoteName('credentials') . ' = ' . $db->quote(json_encode($credentials)))
+            ->set($db->quoteName('modified') . ' = ' . $db->quote(Factory::getDate()->toSql()))
+            ->where($db->quoteName('id') . ' = ' . $serviceId);
+
+        $db->setQuery($query);
+        $db->execute();
+
+        return true;
+    }
+
+    /**
+     * Get the OAuth callback URL for this Joomla installation.
+     *
+     * @return  string
+     */
+    public static function getCallbackUrl(): string
+    {
+        return Uri::root() . 'administrator/index.php?option=com_mokojoomcross&task=oauth.callback';
+    }
+}
@@ -0,0 +1,371 @@
+<?php
+
+/**
+ * @package     MokoJoomCross
+ * @subpackage  com_mokojoomcross
+ * @author      Moko Consulting <hello@mokoconsulting.tech>
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+namespace Joomla\Component\MokoJoomCross\Administrator\Helper;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\Component\MokoJoomCross\Administrator\Service\MokoJoomCrossServiceInterface;
+
+/**
+ * Shared queue processor used by:
+ *   - System plugin onAfterRender (page-load processing)
+ *   - Task scheduler plugin (Joomla scheduled task)
+ *
+ * Handles: queued posts, failed retries, scheduled posts, and log cleanup.
+ * Uses a simple DB-based lock to prevent concurrent execution.
+ */
+class QueueProcessor
+{
+    /**
+     * Process the post queue: dispatch queued posts, retry failed, fire scheduled.
+     *
+     * @param   int  $batchSize  Max posts to process per run
+     *
+     * @return  array  ['processed' => int, 'succeeded' => int, 'failed' => int, 'skipped' => int]
+     */
+    public static function processQueue(int $batchSize = 10): array
+    {
+        $result = ['processed' => 0, 'succeeded' => 0, 'failed' => 0, 'skipped' => 0];
+
+        if (!self::acquireLock()) {
+            $result['skipped'] = -1;
+
+            return $result;
+        }
+
+        try {
+            $db = Factory::getDbo();
+            $componentParams = ComponentHelper::getParams('com_mokojoomcross');
+            $maxRetry   = (int) $componentParams->get('retry_max', 3);
+            $retryDelay = (int) $componentParams->get('retry_delay', 300);
+            $now        = Factory::getDate()->toSql();
+
+            // Build service plugin map
+            $pluginMap = self::getServicePluginMap();
+
+            // 1. Process queued posts
+            $query = $db->getQuery(true)
+                ->select('p.*, s.service_type, s.credentials, s.params AS service_params')
+                ->from($db->quoteName('#__mokojoomcross_posts', 'p'))
+                ->join('INNER', $db->quoteName('#__mokojoomcross_services', 's')
+                    . ' ON ' . $db->quoteName('s.id') . ' = ' . $db->quoteName('p.service_id'))
+                ->where($db->quoteName('p.status') . ' = ' . $db->quote('queued'))
+                ->where('(' . $db->quoteName('p.scheduled_at') . ' IS NULL OR '
+                    . $db->quoteName('p.scheduled_at') . ' <= ' . $db->quote($now) . ')')
+                ->where($db->quoteName('s.published') . ' = 1')
+                ->order($db->quoteName('p.created') . ' ASC')
+                ->setLimit($batchSize);
+
+            $db->setQuery($query);
+            $queuedPosts = $db->loadObjectList() ?: [];
+
+            // 2. Process failed posts eligible for retry
+            $retryAfter = Factory::getDate('now - ' . $retryDelay . ' seconds')->toSql();
+
+            $query = $db->getQuery(true)
+                ->select('p.*, s.service_type, s.credentials, s.params AS service_params')
+                ->from($db->quoteName('#__mokojoomcross_posts', 'p'))
+                ->join('INNER', $db->quoteName('#__mokojoomcross_services', 's')
+                    . ' ON ' . $db->quoteName('s.id') . ' = ' . $db->quoteName('p.service_id'))
+                ->where($db->quoteName('p.status') . ' = ' . $db->quote('failed'))
+                ->where($db->quoteName('p.retry_count') . ' < ' . $maxRetry)
+                ->where($db->quoteName('p.modified') . ' <= ' . $db->quote($retryAfter))
+                ->where($db->quoteName('s.published') . ' = 1')
+                ->order($db->quoteName('p.modified') . ' ASC')
+                ->setLimit($batchSize);
+
+            $db->setQuery($query);
+            $retryPosts = $db->loadObjectList() ?: [];
+
+            $allPosts = array_merge($queuedPosts, $retryPosts);
+
+            foreach ($allPosts as $post) {
+                $result['processed']++;
+
+                $plugin = $pluginMap[$post->service_type] ?? null;
+
+                if (!$plugin) {
+                    $result['skipped']++;
+                    continue;
+                }
+
+                $isRetry = ($post->status === 'failed');
+
+                if ($isRetry) {
+                    // Increment retry count
+                    $newRetryCount = (int) $post->retry_count + 1;
+
+                    $db->setQuery(
+                        $db->getQuery(true)
+                            ->update($db->quoteName('#__mokojoomcross_posts'))
+                            ->set($db->quoteName('retry_count') . ' = ' . $newRetryCount)
+                            ->where($db->quoteName('id') . ' = ' . (int) $post->id)
+                    );
+                    $db->execute();
+                }
+
+                // Mark as posting
+                $db->setQuery(
+                    $db->getQuery(true)
+                        ->update($db->quoteName('#__mokojoomcross_posts'))
+                        ->set($db->quoteName('status') . ' = ' . $db->quote('posting'))
+                        ->set($db->quoteName('modified') . ' = ' . $db->quote(Factory::getDate()->toSql()))
+                        ->where($db->quoteName('id') . ' = ' . (int) $post->id)
+                );
+                $db->execute();
+
+                $credentials = json_decode($post->credentials ?: '{}', true) ?: [];
+                $params      = json_decode($post->service_params ?: '{}', true) ?: [];
+
+                try {
+                    $apiResult = $plugin->publish($post->message, [], $credentials, $params);
+
+                    if (!empty($apiResult['success'])) {
+                        $db->setQuery(
+                            $db->getQuery(true)
+                                ->update($db->quoteName('#__mokojoomcross_posts'))
+                                ->set($db->quoteName('status') . ' = ' . $db->quote('posted'))
+                                ->set($db->quoteName('platform_post_id') . ' = ' . $db->quote($apiResult['platform_post_id'] ?? ''))
+                                ->set($db->quoteName('platform_response') . ' = ' . $db->quote(json_encode($apiResult['response'] ?? [])))
+                                ->set($db->quoteName('posted_at') . ' = ' . $db->quote(Factory::getDate()->toSql()))
+                                ->set($db->quoteName('modified') . ' = ' . $db->quote(Factory::getDate()->toSql()))
+                                ->where($db->quoteName('id') . ' = ' . (int) $post->id)
+                        );
+                        $db->execute();
+
+                        self::log($db, (int) $post->id, (int) $post->service_id, 'info',
+                            sprintf('%s to %s (ID: %s)', $isRetry ? 'Retry succeeded' : 'Posted', $post->service_type, $apiResult['platform_post_id'] ?? 'n/a'));
+
+                        $result['succeeded']++;
+                    } else {
+                        $errorMsg = $apiResult['response']['error'] ?? json_encode($apiResult['response'] ?? []);
+
+                        $db->setQuery(
+                            $db->getQuery(true)
+                                ->update($db->quoteName('#__mokojoomcross_posts'))
+                                ->set($db->quoteName('status') . ' = ' . $db->quote('failed'))
+                                ->set($db->quoteName('error_message') . ' = ' . $db->quote(mb_substr($errorMsg, 0, 1000)))
+                                ->set($db->quoteName('platform_response') . ' = ' . $db->quote(json_encode($apiResult['response'] ?? [])))
+                                ->set($db->quoteName('modified') . ' = ' . $db->quote(Factory::getDate()->toSql()))
+                                ->where($db->quoteName('id') . ' = ' . (int) $post->id)
+                        );
+                        $db->execute();
+
+                        self::log($db, (int) $post->id, (int) $post->service_id, 'error',
+                            sprintf('Failed %s: %s', $post->service_type, mb_substr($errorMsg, 0, 500)));
+
+                        $result['failed']++;
+                    }
+                } catch (\Throwable $e) {
+                    $db->setQuery(
+                        $db->getQuery(true)
+                            ->update($db->quoteName('#__mokojoomcross_posts'))
+                            ->set($db->quoteName('status') . ' = ' . $db->quote('failed'))
+                            ->set($db->quoteName('error_message') . ' = ' . $db->quote(mb_substr($e->getMessage(), 0, 1000)))
+                            ->set($db->quoteName('modified') . ' = ' . $db->quote(Factory::getDate()->toSql()))
+                            ->where($db->quoteName('id') . ' = ' . (int) $post->id)
+                    );
+                    $db->execute();
+
+                    self::log($db, (int) $post->id, (int) $post->service_id, 'error',
+                        sprintf('Exception %s: %s', $post->service_type, mb_substr($e->getMessage(), 0, 500)));
+
+                    $result['failed']++;
+                }
+            }
+
+            // 3. Clean up old logs
+            self::cleanupLogs($db, $componentParams);
+
+        } finally {
+            self::releaseLock();
+        }
+
+        return $result;
+    }
+
+    /**
+     * Check if there are pending items in the queue.
+     *
+     * @return  bool
+     */
+    public static function hasPendingWork(): bool
+    {
+        $db = Factory::getDbo();
+
+        $componentParams = ComponentHelper::getParams('com_mokojoomcross');
+        $maxRetry   = (int) $componentParams->get('retry_max', 3);
+        $retryDelay = (int) $componentParams->get('retry_delay', 300);
+        $retryAfter = Factory::getDate('now - ' . $retryDelay . ' seconds')->toSql();
+        $now        = Factory::getDate()->toSql();
+
+        // Queued posts ready to go
+        $query = $db->getQuery(true)
+            ->select('COUNT(*)')
+            ->from($db->quoteName('#__mokojoomcross_posts'))
+            ->where($db->quoteName('status') . ' = ' . $db->quote('queued'))
+            ->where('(' . $db->quoteName('scheduled_at') . ' IS NULL OR '
+                . $db->quoteName('scheduled_at') . ' <= ' . $db->quote($now) . ')');
+        $db->setQuery($query);
+        $queued = (int) $db->loadResult();
+
+        // Failed posts eligible for retry
+        $query = $db->getQuery(true)
+            ->select('COUNT(*)')
+            ->from($db->quoteName('#__mokojoomcross_posts'))
+            ->where($db->quoteName('status') . ' = ' . $db->quote('failed'))
+            ->where($db->quoteName('retry_count') . ' < ' . $maxRetry)
+            ->where($db->quoteName('modified') . ' <= ' . $db->quote($retryAfter));
+        $db->setQuery($query);
+        $retryable = (int) $db->loadResult();
+
+        return ($queued + $retryable) > 0;
+    }
+
+    /**
+     * Import mokojoomcross plugins and build a type → plugin instance map.
+     *
+     * @return  array<string, MokoJoomCrossServiceInterface>
+     */
+    private static function getServicePluginMap(): array
+    {
+        PluginHelper::importPlugin('mokojoomcross');
+
+        $servicePlugins = [];
+
+        try {
+            Factory::getApplication()->getDispatcher()->dispatch(
+                'onMokoJoomCrossGetServices',
+                new \Joomla\Event\Event('onMokoJoomCrossGetServices', [&$servicePlugins])
+            );
+        } catch (\Throwable $e) {
+            // Dispatcher may not be available in all contexts
+        }
+
+        $map = [];
+
+        foreach ($servicePlugins as $plugin) {
+            if ($plugin instanceof MokoJoomCrossServiceInterface) {
+                $map[$plugin->getServiceType()] = $plugin;
+            }
+        }
+
+        return $map;
+    }
+
+    /**
+     * Delete logs older than the configured retention period.
+     */
+    private static function cleanupLogs($db, $componentParams): void
+    {
+        $retentionDays = (int) $componentParams->get('log_retention_days', 90);
+
+        if ($retentionDays <= 0) {
+            return;
+        }
+
+        $cutoff = Factory::getDate('now - ' . $retentionDays . ' days')->toSql();
+
+        $query = $db->getQuery(true)
+            ->delete($db->quoteName('#__mokojoomcross_logs'))
+            ->where($db->quoteName('created') . ' < ' . $db->quote($cutoff));
+
+        $db->setQuery($query);
+        $db->execute();
+    }
+
+    /**
+     * Simple DB-based lock to prevent concurrent queue processing.
+     */
+    private static function acquireLock(): bool
+    {
+        $db = Factory::getDbo();
+
+        // Use component params as lock storage
+        $query = $db->getQuery(true)
+            ->select($db->quoteName('params'))
+            ->from($db->quoteName('#__extensions'))
+            ->where($db->quoteName('type') . ' = ' . $db->quote('component'))
+            ->where($db->quoteName('element') . ' = ' . $db->quote('com_mokojoomcross'));
+
+        $db->setQuery($query);
+        $params = json_decode($db->loadResult() ?: '{}', true) ?: [];
+
+        $lockTime = $params['_queue_lock'] ?? 0;
+
+        // Lock expires after 120 seconds (safety valve for crashed processes)
+        if ($lockTime > 0 && (time() - $lockTime) < 120) {
+            return false;
+        }
+
+        $params['_queue_lock'] = time();
+
+        $query = $db->getQuery(true)
+            ->update($db->quoteName('#__extensions'))
+            ->set($db->quoteName('params') . ' = ' . $db->quote(json_encode($params)))
+            ->where($db->quoteName('type') . ' = ' . $db->quote('component'))
+            ->where($db->quoteName('element') . ' = ' . $db->quote('com_mokojoomcross'));
+
+        $db->setQuery($query);
+        $db->execute();
+
+        return true;
+    }
+
+    /**
+     * Release the processing lock.
+     */
+    private static function releaseLock(): void
+    {
+        $db = Factory::getDbo();
+
+        $query = $db->getQuery(true)
+            ->select($db->quoteName('params'))
+            ->from($db->quoteName('#__extensions'))
+            ->where($db->quoteName('type') . ' = ' . $db->quote('component'))
+            ->where($db->quoteName('element') . ' = ' . $db->quote('com_mokojoomcross'));
+
+        $db->setQuery($query);
+        $params = json_decode($db->loadResult() ?: '{}', true) ?: [];
+
+        unset($params['_queue_lock']);
+
+        $query = $db->getQuery(true)
+            ->update($db->quoteName('#__extensions'))
+            ->set($db->quoteName('params') . ' = ' . $db->quote(json_encode($params)))
+            ->where($db->quoteName('type') . ' = ' . $db->quote('component'))
+            ->where($db->quoteName('element') . ' = ' . $db->quote('com_mokojoomcross'));
+
+        $db->setQuery($query);
+        $db->execute();
+    }
+
+    /**
+     * Write a log entry.
+     */
+    private static function log($db, ?int $postId, ?int $serviceId, string $level, string $message): void
+    {
+        $log = (object) [
+            'post_id'    => $postId,
+            'service_id' => $serviceId,
+            'level'      => $level,
+            'message'    => mb_substr($message, 0, 2000),
+            'context'    => '{}',
+            'created'    => Factory::getDate()->toSql(),
+        ];
+
+        $db->insertObject('#__mokojoomcross_logs', $log);
+    }
+}
@@ -70,4 +70,115 @@ class DashboardModel extends BaseDatabaseModel

        return !empty($params['migration_available']);
    }
+
+    /**
+     * Get recent activity log entries.
+     *
+     * @param   int  $limit  Number of entries to return
+     *
+     * @return  array
+     */
+    public function getRecentActivity(int $limit = 10): array
+    {
+        $db = $this->getDatabase();
+
+        $query = $db->getQuery(true)
+            ->select('l.*, s.title AS service_title, s.service_type')
+            ->from($db->quoteName('#__mokojoomcross_logs', 'l'))
+            ->join('LEFT', $db->quoteName('#__mokojoomcross_services', 's')
+                . ' ON ' . $db->quoteName('s.id') . ' = ' . $db->quoteName('l.service_id'))
+            ->order($db->quoteName('l.created') . ' DESC');
+
+        $db->setQuery($query, 0, $limit);
+
+        return $db->loadObjectList() ?: [];
+    }
+
+    /**
+     * Get posts-per-service breakdown for the analytics chart.
+     *
+     * @return  array  [['service_type' => '...', 'posted' => N, 'failed' => N, 'queued' => N], ...]
+     */
+    public function getServiceBreakdown(): array
+    {
+        $db = $this->getDatabase();
+
+        $query = $db->getQuery(true)
+            ->select([
+                $db->quoteName('s.service_type'),
+                $db->quoteName('s.title', 'service_title'),
+                'SUM(CASE WHEN ' . $db->quoteName('p.status') . ' = ' . $db->quote('posted') . ' THEN 1 ELSE 0 END) AS posted',
+                'SUM(CASE WHEN ' . $db->quoteName('p.status') . ' = ' . $db->quote('failed') . ' THEN 1 ELSE 0 END) AS failed',
+                'SUM(CASE WHEN ' . $db->quoteName('p.status') . ' = ' . $db->quote('queued') . ' THEN 1 ELSE 0 END) AS queued',
+                'COUNT(*) AS total',
+            ])
+            ->from($db->quoteName('#__mokojoomcross_posts', 'p'))
+            ->join('INNER', $db->quoteName('#__mokojoomcross_services', 's')
+                . ' ON ' . $db->quoteName('s.id') . ' = ' . $db->quoteName('p.service_id'))
+            ->group($db->quoteName(['s.id', 's.service_type', 's.title']))
+            ->order('total DESC');
+
+        $db->setQuery($query);
+
+        return $db->loadAssocList() ?: [];
+    }
+
+    /**
+     * Get posts-per-day for the last N days (for trend chart).
+     *
+     * @param   int  $days  Number of days to look back
+     *
+     * @return  array  [['day' => '2026-05-28', 'posted' => N, 'failed' => N], ...]
+     */
+    public function getDailyTrend(int $days = 14): array
+    {
+        $db = $this->getDatabase();
+
+        $cutoff = Factory::getDate('now - ' . $days . ' days')->format('Y-m-d');
+
+        $query = $db->getQuery(true)
+            ->select([
+                'DATE(' . $db->quoteName('created') . ') AS day',
+                'SUM(CASE WHEN ' . $db->quoteName('status') . ' = ' . $db->quote('posted') . ' THEN 1 ELSE 0 END) AS posted',
+                'SUM(CASE WHEN ' . $db->quoteName('status') . ' = ' . $db->quote('failed') . ' THEN 1 ELSE 0 END) AS failed',
+                'COUNT(*) AS total',
+            ])
+            ->from($db->quoteName('#__mokojoomcross_posts'))
+            ->where('DATE(' . $db->quoteName('created') . ') >= ' . $db->quote($cutoff))
+            ->group('DATE(' . $db->quoteName('created') . ')')
+            ->order('day ASC');
+
+        $db->setQuery($query);
+
+        return $db->loadAssocList() ?: [];
+    }
+
+    /**
+     * Get most cross-posted articles.
+     *
+     * @param   int  $limit  Number of articles
+     *
+     * @return  array
+     */
+    public function getTopArticles(int $limit = 5): array
+    {
+        $db = $this->getDatabase();
+
+        $query = $db->getQuery(true)
+            ->select([
+                $db->quoteName('c.id'),
+                $db->quoteName('c.title'),
+                'COUNT(*) AS post_count',
+                'SUM(CASE WHEN ' . $db->quoteName('p.status') . ' = ' . $db->quote('posted') . ' THEN 1 ELSE 0 END) AS success_count',
+            ])
+            ->from($db->quoteName('#__mokojoomcross_posts', 'p'))
+            ->join('INNER', $db->quoteName('#__content', 'c')
+                . ' ON ' . $db->quoteName('c.id') . ' = ' . $db->quoteName('p.article_id'))
+            ->group($db->quoteName(['c.id', 'c.title']))
+            ->order('post_count DESC');
+
+        $db->setQuery($query, 0, $limit);
+
+        return $db->loadAssocList() ?: [];
+    }
 }
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * @package     MokoJoomCross
+ * @subpackage  com_mokojoomcross
+ * @author      Moko Consulting <hello@mokoconsulting.tech>
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+namespace Joomla\Component\MokoJoomCross\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Model\AdminModel;
+
+class TemplateModel extends AdminModel
+{
+    public function getForm($data = [], $loadData = true)
+    {
+        $form = $this->loadForm(
+            'com_mokojoomcross.template',
+            'template',
+            ['control' => 'jform', 'load_data' => $loadData]
+        );
+
+        if (empty($form)) {
+            return false;
+        }
+
+        return $form;
+    }
+
+    protected function loadFormData()
+    {
+        return $this->getItem();
+    }
+}
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * @package     MokoJoomCross
+ * @subpackage  com_mokojoomcross
+ * @author      Moko Consulting <hello@mokoconsulting.tech>
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+namespace Joomla\Component\MokoJoomCross\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Model\ListModel;
+
+class TemplatesModel extends ListModel
+{
+    public function __construct($config = [])
+    {
+        if (empty($config['filter_fields'])) {
+            $config['filter_fields'] = [
+                'id', 'a.id',
+                'title', 'a.title',
+                'service_type', 'a.service_type',
+                'published', 'a.published',
+                'ordering', 'a.ordering',
+            ];
+        }
+
+        parent::__construct($config);
+    }
+
+    protected function getListQuery()
+    {
+        $db    = $this->getDatabase();
+        $query = $db->getQuery(true);
+
+        $query->select('a.*')
+            ->from($db->quoteName('#__mokojoomcross_templates', 'a'));
+
+        $published = $this->getState('filter.published');
+
+        if (is_numeric($published)) {
+            $query->where($db->quoteName('a.published') . ' = ' . (int) $published);
+        }
+
+        $serviceType = $this->getState('filter.service_type');
+
+        if (!empty($serviceType)) {
+            $query->where($db->quoteName('a.service_type') . ' = ' . $db->quote($serviceType));
+        }
+
+        $orderCol  = $this->state->get('list.ordering', 'a.ordering');
+        $orderDirn = $this->state->get('list.direction', 'ASC');
+        $query->order($db->escape($orderCol) . ' ' . $db->escape($orderDirn));
+
+        return $query;
+    }
+}
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @package     MokoJoomCross
+ * @subpackage  com_mokojoomcross
+ * @author      Moko Consulting <hello@mokoconsulting.tech>
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+namespace Joomla\Component\MokoJoomCross\Administrator\Table;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Table\Table;
+use Joomla\Database\DatabaseDriver;
+
+class TemplateTable extends Table
+{
+    public function __construct(DatabaseDriver $db)
+    {
+        parent::__construct('#__mokojoomcross_templates', 'id', $db);
+    }
+}
@@ -20,11 +20,21 @@ class HtmlView extends BaseHtmlView
 {
    protected $stats;
    protected $migrationAvailable;
+    protected $recentActivity;
+    protected $serviceBreakdown;
+    protected $dailyTrend;
+    protected $topArticles;

    public function display($tpl = null): void
    {
-        $this->stats = $this->get('Stats');
+        $model = $this->getModel();
+
+        $this->stats              = $this->get('Stats');
        $this->migrationAvailable = $this->get('MigrationAvailable');
+        $this->recentActivity     = $model->getRecentActivity(10);
+        $this->serviceBreakdown   = $model->getServiceBreakdown();
+        $this->dailyTrend         = $model->getDailyTrend(14);
+        $this->topArticles        = $model->getTopArticles(5);

        $this->addToolbar();

@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @package     MokoJoomCross
+ * @subpackage  com_mokojoomcross
+ * @author      Moko Consulting <hello@mokoconsulting.tech>
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+namespace Joomla\Component\MokoJoomCross\Administrator\View\Template;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+
+class HtmlView extends BaseHtmlView
+{
+    protected $form;
+    protected $item;
+
+    public function display($tpl = null): void
+    {
+        $this->form = $this->get('Form');
+        $this->item = $this->get('Item');
+
+        $this->addToolbar();
+
+        parent::display($tpl);
+    }
+
+    protected function addToolbar(): void
+    {
+        $isNew = empty($this->item->id);
+
+        ToolbarHelper::title(
+            'MokoJoomCross — ' . ($isNew ? 'New Template' : 'Edit Template'),
+            'share-alt'
+        );
+        ToolbarHelper::apply('template.apply');
+        ToolbarHelper::save('template.save');
+        ToolbarHelper::cancel('template.cancel');
+    }
+}
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @package     MokoJoomCross
+ * @subpackage  com_mokojoomcross
+ * @author      Moko Consulting <hello@mokoconsulting.tech>
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+namespace Joomla\Component\MokoJoomCross\Administrator\View\Templates;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+
+class HtmlView extends BaseHtmlView
+{
+    protected $items;
+    protected $pagination;
+    protected $state;
+
+    public function display($tpl = null): void
+    {
+        $this->items      = $this->get('Items');
+        $this->pagination = $this->get('Pagination');
+        $this->state      = $this->get('State');
+
+        $this->addToolbar();
+
+        parent::display($tpl);
+    }
+
+    protected function addToolbar(): void
+    {
+        ToolbarHelper::title('MokoJoomCross — Message Templates', 'share-alt');
+        ToolbarHelper::addNew('template.add');
+        ToolbarHelper::editList('template.edit');
+        ToolbarHelper::publish('templates.publish', 'JTOOLBAR_PUBLISH', true);
+        ToolbarHelper::unpublish('templates.unpublish', 'JTOOLBAR_UNPUBLISH', true);
+        ToolbarHelper::deleteList('', 'templates.delete', 'JTOOLBAR_DELETE');
+    }
+}
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
@@ -11,12 +11,25 @@

 defined('_JEXEC') or die;

+use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;

 /** @var \Joomla\Component\MokoJoomCross\Administrator\View\Dashboard\HtmlView $this */
 $stats = $this->stats;
+$componentParams = ComponentHelper::getParams('com_mokojoomcross');
+$queueProcessing = $componentParams->get('queue_processing', 'scheduler');
 ?>
+<?php if ($queueProcessing === 'pageload' || $queueProcessing === 'both') : ?>
+<div class="alert alert-warning d-flex align-items-start mb-3">
+    <span class="icon-exclamation-triangle me-2 mt-1" aria-hidden="true"></span>
+    <div>
+        <strong><?php echo Text::_('COM_MOKOJOOMCROSS_DASHBOARD_PAGELOAD_WARNING_TITLE'); ?></strong><br>
+        <?php echo Text::_('COM_MOKOJOOMCROSS_DASHBOARD_PAGELOAD_WARNING'); ?>
+    </div>
+</div>
+<?php endif; ?>
+
 <div class="row">
    <div class="col-lg-9">
        <div class="row">
@@ -64,6 +77,107 @@ $stats = $this->stats;
            </a>
        </div>
        <?php endif; ?>
+
+        <!-- Analytics: Service Breakdown -->
+        <?php if (!empty($this->serviceBreakdown)) : ?>
+        <div class="card mt-3">
+            <div class="card-header">
+                <h5 class="card-title mb-0"><?php echo Text::_('COM_MOKOJOOMCROSS_DASHBOARD_SERVICE_BREAKDOWN'); ?></h5>
+            </div>
+            <div class="card-body">
+                <table class="table table-sm table-striped mb-0">
+                    <thead>
+                        <tr>
+                            <th><?php echo Text::_('COM_MOKOJOOMCROSS_HEADING_SERVICE'); ?></th>
+                            <th class="text-center text-success"><?php echo Text::_('COM_MOKOJOOMCROSS_DASHBOARD_POSTED'); ?></th>
+                            <th class="text-center text-danger"><?php echo Text::_('COM_MOKOJOOMCROSS_DASHBOARD_FAILED'); ?></th>
+                            <th class="text-center text-warning"><?php echo Text::_('COM_MOKOJOOMCROSS_DASHBOARD_QUEUED'); ?></th>
+                            <th class="text-center"><?php echo Text::_('COM_MOKOJOOMCROSS_DASHBOARD_TOTAL_POSTS'); ?></th>
+                            <th class="text-center"><?php echo Text::_('COM_MOKOJOOMCROSS_DASHBOARD_SUCCESS_RATE'); ?></th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <?php foreach ($this->serviceBreakdown as $row) :
+                        $rate = $row['total'] > 0 ? round(($row['posted'] / $row['total']) * 100) : 0;
+                        $rateClass = $rate >= 80 ? 'text-success' : ($rate >= 50 ? 'text-warning' : 'text-danger');
+                    ?>
+                        <tr>
+                            <td><?php echo htmlspecialchars($row['service_title'] . ' (' . ucfirst($row['service_type']) . ')'); ?></td>
+                            <td class="text-center"><span class="badge bg-success"><?php echo (int) $row['posted']; ?></span></td>
+                            <td class="text-center"><span class="badge bg-danger"><?php echo (int) $row['failed']; ?></span></td>
+                            <td class="text-center"><span class="badge bg-warning text-dark"><?php echo (int) $row['queued']; ?></span></td>
+                            <td class="text-center"><?php echo (int) $row['total']; ?></td>
+                            <td class="text-center <?php echo $rateClass; ?> fw-bold"><?php echo $rate; ?>%</td>
+                        </tr>
+                    <?php endforeach; ?>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+        <?php endif; ?>
+
+        <!-- Analytics: Top Articles -->
+        <?php if (!empty($this->topArticles)) : ?>
+        <div class="card mt-3">
+            <div class="card-header">
+                <h5 class="card-title mb-0"><?php echo Text::_('COM_MOKOJOOMCROSS_DASHBOARD_TOP_ARTICLES'); ?></h5>
+            </div>
+            <div class="card-body p-0">
+                <div class="list-group list-group-flush">
+                <?php foreach ($this->topArticles as $row) : ?>
+                    <div class="list-group-item d-flex justify-content-between align-items-center">
+                        <span><?php echo htmlspecialchars($row['title']); ?></span>
+                        <span>
+                            <span class="badge bg-success"><?php echo (int) $row['success_count']; ?></span>
+                            /
+                            <span class="badge bg-secondary"><?php echo (int) $row['post_count']; ?></span>
+                        </span>
+                    </div>
+                <?php endforeach; ?>
+                </div>
+            </div>
+        </div>
+        <?php endif; ?>
+
+        <!-- Recent Activity -->
+        <div class="card mt-3">
+            <div class="card-header">
+                <h5 class="card-title mb-0"><?php echo Text::_('COM_MOKOJOOMCROSS_DASHBOARD_RECENT_ACTIVITY'); ?></h5>
+            </div>
+            <div class="card-body p-0">
+                <?php if (empty($this->recentActivity)) : ?>
+                    <p class="p-3 mb-0 text-muted"><?php echo Text::_('COM_MOKOJOOMCROSS_DASHBOARD_NO_RECENT'); ?></p>
+                <?php else : ?>
+                    <div class="list-group list-group-flush">
+                        <?php foreach ($this->recentActivity as $entry) :
+                            $levelClass = match ($entry->level) {
+                                'error'   => 'text-danger',
+                                'warning' => 'text-warning',
+                                default   => 'text-muted',
+                            };
+                            $levelIcon = match ($entry->level) {
+                                'error'   => 'icon-times-circle',
+                                'warning' => 'icon-exclamation-triangle',
+                                default   => 'icon-info-circle',
+                            };
+                        ?>
+                            <div class="list-group-item">
+                                <div class="d-flex w-100 justify-content-between">
+                                    <span class="<?php echo $levelClass; ?>">
+                                        <span class="<?php echo $levelIcon; ?>" aria-hidden="true"></span>
+                                        <?php echo htmlspecialchars(mb_substr($entry->message, 0, 120)); ?>
+                                    </span>
+                                    <small class="text-muted"><?php echo \Joomla\CMS\HTML\HTMLHelper::_('date', $entry->created, 'Y-m-d H:i'); ?></small>
+                                </div>
+                                <?php if ($entry->service_title) : ?>
+                                    <small class="text-muted"><?php echo htmlspecialchars($entry->service_title); ?></small>
+                                <?php endif; ?>
+                            </div>
+                        <?php endforeach; ?>
+                    </div>
+                <?php endif; ?>
+            </div>
+        </div>
    </div>

    <div class="col-lg-3">
@@ -79,6 +193,10 @@ $stats = $this->stats;
                       class="list-group-item list-group-item-action">
                        <?php echo Text::_('COM_MOKOJOOMCROSS_SUBMENU_POSTS'); ?>
                    </a>
+                    <a href="<?php echo Route::_('index.php?option=com_mokojoomcross&view=templates'); ?>"
+                       class="list-group-item list-group-item-action">
+                        <?php echo Text::_('COM_MOKOJOOMCROSS_SUBMENU_TEMPLATES'); ?>
+                    </a>
                    <a href="<?php echo Route::_('index.php?option=com_mokojoomcross&view=logs'); ?>"
                       class="list-group-item list-group-item-action">
                        <?php echo Text::_('COM_MOKOJOOMCROSS_SUBMENU_LOGS'); ?>
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * @package     MokoJoomCross
+ * @subpackage  com_mokojoomcross
+ * @author      Moko Consulting <hello@mokoconsulting.tech>
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+
+/** @var \Joomla\Component\MokoJoomCross\Administrator\View\Logs\HtmlView $this */
+
+HTMLHelper::_('behavior.multiselect');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+
+$levelBadges = [
+    'info'    => 'bg-info',
+    'warning' => 'bg-warning text-dark',
+    'error'   => 'bg-danger',
+];
+?>
+<form action="<?php echo Route::_('index.php?option=com_mokojoomcross&view=logs'); ?>" method="post" name="adminForm" id="adminForm">
+    <div class="row">
+        <div class="col-md-12">
+            <div id="j-main-container" class="j-main-container">
+                <?php echo LayoutHelper::render('joomla.searchtools.default', ['view' => $this]); ?>
+
+                <?php if (empty($this->items)) : ?>
+                    <div class="alert alert-info">
+                        <span class="icon-info-circle" aria-hidden="true"></span>
+                        <?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+                    </div>
+                <?php else : ?>
+                    <table class="table" id="logsList">
+                        <caption class="visually-hidden"><?php echo Text::_('COM_MOKOJOOMCROSS_SUBMENU_LOGS'); ?></caption>
+                        <thead>
+                            <tr>
+                                <td class="w-1 text-center">
+                                    <?php echo HTMLHelper::_('grid.checkall'); ?>
+                                </td>
+                                <th scope="col" class="w-10">
+                                    <?php echo Text::_('COM_MOKOJOOMCROSS_HEADING_LEVEL'); ?>
+                                </th>
+                                <th scope="col">
+                                    <?php echo Text::_('COM_MOKOJOOMCROSS_HEADING_MESSAGE'); ?>
+                                </th>
+                                <th scope="col" class="w-15 d-none d-md-table-cell">
+                                    <?php echo Text::_('COM_MOKOJOOMCROSS_HEADING_SERVICE'); ?>
+                                </th>
+                                <th scope="col" class="w-10">
+                                    <?php echo HTMLHelper::_('searchtools.sort', 'COM_MOKOJOOMCROSS_HEADING_CREATED', 'a.created', $listDirn, $listOrder); ?>
+                                </th>
+                                <th scope="col" class="w-5 text-center d-none d-md-table-cell">
+                                    <?php echo Text::_('JGRID_HEADING_ID'); ?>
+                                </th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                        <?php foreach ($this->items as $i => $item) :
+                            $badgeClass = $levelBadges[$item->level] ?? 'bg-secondary';
+                        ?>
+                            <tr class="row<?php echo $i % 2; ?>">
+                                <td class="text-center">
+                                    <?php echo HTMLHelper::_('grid.id', $i, $item->id, false, 'cid', 'cb', ''); ?>
+                                </td>
+                                <td>
+                                    <span class="badge <?php echo $badgeClass; ?>">
+                                        <?php echo $this->escape(ucfirst($item->level)); ?>
+                                    </span>
+                                </td>
+                                <td>
+                                    <?php echo $this->escape($item->message); ?>
+                                    <?php if (!empty($item->context) && $item->context !== '{}') : ?>
+                                        <br><small class="text-muted"><code><?php echo $this->escape(mb_substr($item->context, 0, 200)); ?></code></small>
+                                    <?php endif; ?>
+                                </td>
+                                <td class="d-none d-md-table-cell">
+                                    <?php echo $this->escape($item->service_title ?? '—'); ?>
+                                </td>
+                                <td>
+                                    <?php echo HTMLHelper::_('date', $item->created, 'Y-m-d H:i:s'); ?>
+                                </td>
+                                <td class="text-center d-none d-md-table-cell">
+                                    <?php echo (int) $item->id; ?>
+                                </td>
+                            </tr>
+                        <?php endforeach; ?>
+                        </tbody>
+                    </table>
+
+                    <?php echo $this->pagination->getListFooter(); ?>
+                <?php endif; ?>
+
+                <input type="hidden" name="task" value="">
+                <input type="hidden" name="boxchecked" value="0">
+                <?php echo HTMLHelper::_('form.token'); ?>
+            </div>
+        </div>
+    </div>
+</form>
@@ -0,0 +1,131 @@
+<?php
+
+/**
+ * @package     MokoJoomCross
+ * @subpackage  com_mokojoomcross
+ * @author      Moko Consulting <hello@mokoconsulting.tech>
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+
+/** @var \Joomla\Component\MokoJoomCross\Administrator\View\Posts\HtmlView $this */
+
+HTMLHelper::_('behavior.multiselect');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+
+$statusBadges = [
+    'queued'    => 'bg-warning text-dark',
+    'posting'   => 'bg-info',
+    'posted'    => 'bg-success',
+    'failed'    => 'bg-danger',
+    'scheduled' => 'bg-secondary',
+];
+?>
+<form action="<?php echo Route::_('index.php?option=com_mokojoomcross&view=posts'); ?>" method="post" name="adminForm" id="adminForm">
+    <div class="row">
+        <div class="col-md-12">
+            <div id="j-main-container" class="j-main-container">
+                <?php echo LayoutHelper::render('joomla.searchtools.default', ['view' => $this]); ?>
+
+                <?php if (empty($this->items)) : ?>
+                    <div class="alert alert-info">
+                        <span class="icon-info-circle" aria-hidden="true"></span>
+                        <?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+                    </div>
+                <?php else : ?>
+                    <table class="table" id="postsList">
+                        <caption class="visually-hidden"><?php echo Text::_('COM_MOKOJOOMCROSS_SUBMENU_POSTS'); ?></caption>
+                        <thead>
+                            <tr>
+                                <td class="w-1 text-center">
+                                    <?php echo HTMLHelper::_('grid.checkall'); ?>
+                                </td>
+                                <th scope="col" class="w-10">
+                                    <?php echo Text::_('COM_MOKOJOOMCROSS_HEADING_STATUS'); ?>
+                                </th>
+                                <th scope="col">
+                                    <?php echo Text::_('COM_MOKOJOOMCROSS_HEADING_ARTICLE'); ?>
+                                </th>
+                                <th scope="col" class="w-15">
+                                    <?php echo Text::_('COM_MOKOJOOMCROSS_HEADING_SERVICE'); ?>
+                                </th>
+                                <th scope="col" class="w-15 d-none d-md-table-cell">
+                                    <?php echo Text::_('COM_MOKOJOOMCROSS_HEADING_MESSAGE'); ?>
+                                </th>
+                                <th scope="col" class="w-10 d-none d-md-table-cell">
+                                    <?php echo HTMLHelper::_('searchtools.sort', 'COM_MOKOJOOMCROSS_HEADING_POSTED_AT', 'a.posted_at', $listDirn, $listOrder); ?>
+                                </th>
+                                <th scope="col" class="w-10 d-none d-lg-table-cell">
+                                    <?php echo HTMLHelper::_('searchtools.sort', 'COM_MOKOJOOMCROSS_HEADING_CREATED', 'a.created', $listDirn, $listOrder); ?>
+                                </th>
+                                <th scope="col" class="w-5 text-center d-none d-md-table-cell">
+                                    <?php echo Text::_('JGRID_HEADING_ID'); ?>
+                                </th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                        <?php foreach ($this->items as $i => $item) :
+                            $badgeClass = $statusBadges[$item->status] ?? 'bg-secondary';
+                        ?>
+                            <tr class="row<?php echo $i % 2; ?>">
+                                <td class="text-center">
+                                    <?php echo HTMLHelper::_('grid.id', $i, $item->id, false, 'cid', 'cb', $item->article_title ?? ''); ?>
+                                </td>
+                                <td>
+                                    <span class="badge <?php echo $badgeClass; ?>">
+                                        <?php echo $this->escape(ucfirst($item->status)); ?>
+                                    </span>
+                                    <?php if ($item->status === 'failed' && !empty($item->error_message)) : ?>
+                                        <br><small class="text-danger"><?php echo $this->escape(mb_substr($item->error_message, 0, 80)); ?></small>
+                                    <?php endif; ?>
+                                    <?php if ($item->retry_count > 0) : ?>
+                                        <br><small class="text-muted">Retries: <?php echo (int) $item->retry_count; ?></small>
+                                    <?php endif; ?>
+                                </td>
+                                <td>
+                                    <?php echo $this->escape($item->article_title ?? 'Article #' . $item->article_id); ?>
+                                </td>
+                                <td>
+                                    <?php echo $this->escape($item->service_title ?? ''); ?>
+                                    <br><small class="text-muted"><?php echo $this->escape($item->service_type ?? ''); ?></small>
+                                </td>
+                                <td class="d-none d-md-table-cell">
+                                    <small><?php echo $this->escape(mb_substr($item->message ?? '', 0, 100)); ?></small>
+                                    <?php if (!empty($item->platform_post_id)) : ?>
+                                        <br><small class="text-success">ID: <?php echo $this->escape($item->platform_post_id); ?></small>
+                                    <?php endif; ?>
+                                </td>
+                                <td class="d-none d-md-table-cell">
+                                    <?php echo $item->posted_at ? HTMLHelper::_('date', $item->posted_at, 'Y-m-d H:i') : '—'; ?>
+                                </td>
+                                <td class="d-none d-lg-table-cell">
+                                    <?php echo HTMLHelper::_('date', $item->created, 'Y-m-d H:i'); ?>
+                                </td>
+                                <td class="text-center d-none d-md-table-cell">
+                                    <?php echo (int) $item->id; ?>
+                                </td>
+                            </tr>
+                        <?php endforeach; ?>
+                        </tbody>
+                    </table>
+
+                    <?php echo $this->pagination->getListFooter(); ?>
+                <?php endif; ?>
+
+                <input type="hidden" name="task" value="">
+                <input type="hidden" name="boxchecked" value="0">
+                <?php echo HTMLHelper::_('form.token'); ?>
+            </div>
+        </div>
+    </div>
+</form>
@@ -0,0 +1,120 @@
+<?php
+
+/**
+ * @package     MokoJoomCross
+ * @subpackage  com_mokojoomcross
+ * @author      Moko Consulting <hello@mokoconsulting.tech>
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+
+/** @var \Joomla\Component\MokoJoomCross\Administrator\View\Services\HtmlView $this */
+
+HTMLHelper::_('behavior.multiselect');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+
+$serviceIcons = [
+    'facebook'  => 'icon-facebook',
+    'twitter'   => 'icon-twitter',
+    'linkedin'  => 'icon-linkedin',
+    'mastodon'  => 'icon-globe',
+    'bluesky'   => 'icon-cloud',
+    'mailchimp' => 'icon-envelope',
+    'telegram'  => 'icon-comment',
+    'discord'   => 'icon-comments',
+    'slack'     => 'icon-comments-2',
+];
+?>
+<form action="<?php echo Route::_('index.php?option=com_mokojoomcross&view=services'); ?>" method="post" name="adminForm" id="adminForm">
+    <div class="row">
+        <div class="col-md-12">
+            <div id="j-main-container" class="j-main-container">
+                <?php echo LayoutHelper::render('joomla.searchtools.default', ['view' => $this]); ?>
+
+                <?php if (empty($this->items)) : ?>
+                    <div class="alert alert-info">
+                        <span class="icon-info-circle" aria-hidden="true"></span>
+                        <?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+                    </div>
+                <?php else : ?>
+                    <table class="table" id="servicesList">
+                        <caption class="visually-hidden"><?php echo Text::_('COM_MOKOJOOMCROSS_SUBMENU_SERVICES'); ?></caption>
+                        <thead>
+                            <tr>
+                                <td class="w-1 text-center">
+                                    <?php echo HTMLHelper::_('grid.checkall'); ?>
+                                </td>
+                                <th scope="col" class="w-1 text-center">
+                                    <?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
+                                </th>
+                                <th scope="col">
+                                    <?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+                                </th>
+                                <th scope="col" class="w-15">
+                                    <?php echo HTMLHelper::_('searchtools.sort', 'COM_MOKOJOOMCROSS_FIELD_SERVICE_TYPE', 'a.service_type', $listDirn, $listOrder); ?>
+                                </th>
+                                <th scope="col" class="w-10 text-center d-none d-md-table-cell">
+                                    <?php echo Text::_('COM_MOKOJOOMCROSS_HEADING_MODE'); ?>
+                                </th>
+                                <th scope="col" class="w-5 text-center d-none d-md-table-cell">
+                                    <?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
+                                </th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                        <?php foreach ($this->items as $i => $item) :
+                            $credentials = json_decode($item->credentials ?: '{}', true) ?: [];
+                            $mode = $credentials['mode'] ?? 'custom';
+                            $icon = $serviceIcons[$item->service_type] ?? 'icon-cog';
+                        ?>
+                            <tr class="row<?php echo $i % 2; ?>">
+                                <td class="text-center">
+                                    <?php echo HTMLHelper::_('grid.id', $i, $item->id, false, 'cid', 'cb', $item->title); ?>
+                                </td>
+                                <td class="text-center">
+                                    <?php echo HTMLHelper::_('jgrid.published', $item->published, $i, 'services.', true); ?>
+                                </td>
+                                <td>
+                                    <a href="<?php echo Route::_('index.php?option=com_mokojoomcross&task=service.edit&id=' . $item->id); ?>">
+                                        <?php echo $this->escape($item->title); ?>
+                                    </a>
+                                </td>
+                                <td>
+                                    <span class="<?php echo $icon; ?>" aria-hidden="true"></span>
+                                    <?php echo $this->escape(ucfirst($item->service_type)); ?>
+                                </td>
+                                <td class="text-center d-none d-md-table-cell">
+                                    <?php if ($mode === 'default') : ?>
+                                        <span class="badge bg-primary">Default Bot</span>
+                                    <?php else : ?>
+                                        <span class="badge bg-secondary">Custom</span>
+                                    <?php endif; ?>
+                                </td>
+                                <td class="text-center d-none d-md-table-cell">
+                                    <?php echo (int) $item->id; ?>
+                                </td>
+                            </tr>
+                        <?php endforeach; ?>
+                        </tbody>
+                    </table>
+
+                    <?php echo $this->pagination->getListFooter(); ?>
+                <?php endif; ?>
+
+                <input type="hidden" name="task" value="">
+                <input type="hidden" name="boxchecked" value="0">
+                <?php echo HTMLHelper::_('form.token'); ?>
+            </div>
+        </div>
+    </div>
+</form>
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @package     MokoJoomCross
+ * @subpackage  com_mokojoomcross
+ * @author      Moko Consulting <hello@mokoconsulting.tech>
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+
+/** @var \Joomla\CMS\Form\Form $this->form */
+
+HTMLHelper::_('behavior.formvalidator');
+HTMLHelper::_('behavior.keepalive');
+?>
+<form action="<?php echo Route::_('index.php?option=com_mokojoomcross&layout=edit&id=' . (int) $this->item->id); ?>"
+      method="post" name="adminForm" id="adminForm" class="form-validate">
+
+    <div class="main-card">
+        <div class="row">
+            <div class="col-lg-9">
+                <?php echo $this->form->renderFieldset('details'); ?>
+            </div>
+            <div class="col-lg-3">
+                <div class="card">
+                    <div class="card-body">
+                        <h4><?php echo Text::_('COM_MOKOJOOMCROSS_FIELDSET_CREDENTIALS'); ?></h4>
+                        <?php echo $this->form->renderFieldset('credentials'); ?>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <input type="hidden" name="task" value="">
+    <?php echo HTMLHelper::_('form.token'); ?>
+</form>
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * @package     MokoJoomCross
+ * @subpackage  com_mokojoomcross
+ * @author      Moko Consulting <hello@mokoconsulting.tech>
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+
+/** @var \Joomla\Component\MokoJoomCross\Administrator\View\Template\HtmlView $this */
+
+HTMLHelper::_('behavior.formvalidator');
+HTMLHelper::_('behavior.keepalive');
+?>
+<form action="<?php echo Route::_('index.php?option=com_mokojoomcross&layout=edit&id=' . (int) ($this->item->id ?? 0)); ?>"
+      method="post" name="adminForm" id="adminForm" class="form-validate">
+
+    <div class="main-card">
+        <div class="row">
+            <div class="col-lg-8">
+                <?php echo $this->form->renderFieldset('details'); ?>
+            </div>
+            <div class="col-lg-4">
+                <div class="card">
+                    <div class="card-header">
+                        <h5 class="card-title mb-0"><?php echo Text::_('COM_MOKOJOOMCROSS_TEMPLATE_PLACEHOLDERS'); ?></h5>
+                    </div>
+                    <div class="card-body">
+                        <table class="table table-sm table-striped">
+                            <tbody>
+                                <tr><td><code>{title}</code></td><td><?php echo Text::_('COM_MOKOJOOMCROSS_PLACEHOLDER_TITLE'); ?></td></tr>
+                                <tr><td><code>{url}</code></td><td><?php echo Text::_('COM_MOKOJOOMCROSS_PLACEHOLDER_URL'); ?></td></tr>
+                                <tr><td><code>{introtext}</code></td><td><?php echo Text::_('COM_MOKOJOOMCROSS_PLACEHOLDER_INTROTEXT'); ?></td></tr>
+                                <tr><td><code>{fulltext}</code></td><td><?php echo Text::_('COM_MOKOJOOMCROSS_PLACEHOLDER_FULLTEXT'); ?></td></tr>
+                                <tr><td><code>{image}</code></td><td><?php echo Text::_('COM_MOKOJOOMCROSS_PLACEHOLDER_IMAGE'); ?></td></tr>
+                                <tr><td><code>{category}</code></td><td><?php echo Text::_('COM_MOKOJOOMCROSS_PLACEHOLDER_CATEGORY'); ?></td></tr>
+                                <tr><td><code>{author}</code></td><td><?php echo Text::_('COM_MOKOJOOMCROSS_PLACEHOLDER_AUTHOR'); ?></td></tr>
+                                <tr><td><code>{date}</code></td><td><?php echo Text::_('COM_MOKOJOOMCROSS_PLACEHOLDER_DATE'); ?></td></tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <input type="hidden" name="task" value="">
+    <?php echo HTMLHelper::_('form.token'); ?>
+</form>
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
@@ -0,0 +1,103 @@
+<?php
+
+/**
+ * @package     MokoJoomCross
+ * @subpackage  com_mokojoomcross
+ * @author      Moko Consulting <hello@mokoconsulting.tech>
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+
+/** @var \Joomla\Component\MokoJoomCross\Administrator\View\Templates\HtmlView $this */
+
+HTMLHelper::_('behavior.multiselect');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn  = $this->escape($this->state->get('list.direction'));
+?>
+<form action="<?php echo Route::_('index.php?option=com_mokojoomcross&view=templates'); ?>" method="post" name="adminForm" id="adminForm">
+    <div class="row">
+        <div class="col-md-12">
+            <div id="j-main-container" class="j-main-container">
+                <?php echo LayoutHelper::render('joomla.searchtools.default', ['view' => $this]); ?>
+
+                <?php if (empty($this->items)) : ?>
+                    <div class="alert alert-info">
+                        <span class="icon-info-circle" aria-hidden="true"></span>
+                        <?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+                    </div>
+                <?php else : ?>
+                    <table class="table" id="templatesList">
+                        <caption class="visually-hidden"><?php echo Text::_('COM_MOKOJOOMCROSS_SUBMENU_TEMPLATES'); ?></caption>
+                        <thead>
+                            <tr>
+                                <td class="w-1 text-center">
+                                    <?php echo HTMLHelper::_('grid.checkall'); ?>
+                                </td>
+                                <th scope="col" class="w-1 text-center">
+                                    <?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.published', $listDirn, $listOrder); ?>
+                                </th>
+                                <th scope="col">
+                                    <?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+                                </th>
+                                <th scope="col" class="w-15">
+                                    <?php echo Text::_('COM_MOKOJOOMCROSS_FIELD_SERVICE_TYPE'); ?>
+                                </th>
+                                <th scope="col" class="d-none d-md-table-cell">
+                                    <?php echo Text::_('COM_MOKOJOOMCROSS_TEMPLATE_PREVIEW'); ?>
+                                </th>
+                                <th scope="col" class="w-5 text-center d-none d-md-table-cell">
+                                    <?php echo Text::_('JGRID_HEADING_ID'); ?>
+                                </th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                        <?php foreach ($this->items as $i => $item) : ?>
+                            <tr class="row<?php echo $i % 2; ?>">
+                                <td class="text-center">
+                                    <?php echo HTMLHelper::_('grid.id', $i, $item->id, false, 'cid', 'cb', $item->title); ?>
+                                </td>
+                                <td class="text-center">
+                                    <?php echo HTMLHelper::_('jgrid.published', $item->published, $i, 'templates.', true); ?>
+                                </td>
+                                <td>
+                                    <a href="<?php echo Route::_('index.php?option=com_mokojoomcross&task=template.edit&id=' . $item->id); ?>">
+                                        <?php echo $this->escape($item->title); ?>
+                                    </a>
+                                </td>
+                                <td>
+                                    <?php if ($item->service_type === 'default') : ?>
+                                        <span class="badge bg-primary">Default</span>
+                                    <?php else : ?>
+                                        <?php echo $this->escape(ucfirst($item->service_type)); ?>
+                                    <?php endif; ?>
+                                </td>
+                                <td class="d-none d-md-table-cell">
+                                    <code class="small"><?php echo $this->escape(mb_substr($item->template_body, 0, 80)); ?></code>
+                                </td>
+                                <td class="text-center d-none d-md-table-cell">
+                                    <?php echo (int) $item->id; ?>
+                                </td>
+                            </tr>
+                        <?php endforeach; ?>
+                        </tbody>
+                    </table>
+
+                    <?php echo $this->pagination->getListFooter(); ?>
+                <?php endif; ?>
+
+                <input type="hidden" name="task" value="">
+                <input type="hidden" name="boxchecked" value="0">
+                <?php echo HTMLHelper::_('form.token'); ?>
+            </div>
+        </div>
+    </div>
+</form>
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
@@ -1,2 +1,8 @@
 PLG_CONTENT_MOKOJOOMCROSS="Content - MokoJoomCross"
-PLG_CONTENT_MOKOJOOMCROSS_DESCRIPTION="Adds cross-post status badges to articles in the admin backend."
+PLG_CONTENT_MOKOJOOMCROSS_DESCRIPTION="Adds cross-post status badges and per-article service selection to the article editor."
+
+PLG_CONTENT_MOKOJOOMCROSS_FIELDSET_CROSSPOST="Cross-Posting"
+PLG_CONTENT_MOKOJOOMCROSS_SKIP="Skip Cross-Posting"
+PLG_CONTENT_MOKOJOOMCROSS_SKIP_DESC="Skip all cross-posting for this article."
+PLG_CONTENT_MOKOJOOMCROSS_SERVICES="Post to Services"
+PLG_CONTENT_MOKOJOOMCROSS_SERVICES_DESC="Select which services to cross-post to. Leave all unchecked to post to all enabled services."
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="content" method="upgrade">
    <name>Content - MokoJoomCross</name>
-    <version>01.00.01-dev</version>
+    <version>01.00.06-dev-dev</version>
    <creationDate>2026-05-28</creationDate>
    <author>Moko Consulting</author>
    <authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -14,30 +14,101 @@ namespace Joomla\Plugin\Content\MokoJoomCross\Extension;
 defined('_JEXEC') or die;

 use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\Event\SubscriberInterface;

 /**
- * Content plugin that adds cross-post status badges to article views.
+ * Content plugin that:
+ *   1. Adds cross-post status badges to article views in admin
+ *   2. Injects service selection checkboxes into the article editor (#19)
 */
 class MokoJoomCrossContent extends CMSPlugin implements SubscriberInterface
 {
    public static function getSubscribedEvents(): array
    {
        return [
-            'onContentBeforeDisplay' => 'onContentBeforeDisplay',
+            'onContentBeforeDisplay'  => 'onContentBeforeDisplay',
+            'onContentPrepareForm'    => 'onContentPrepareForm',
        ];
    }

    /**
-     * Add cross-post status indicator before article content in admin.
+     * Inject cross-post service selection fields into article edit form.
     *
-     * @param   string  $context  The context
-     * @param   object  $article  The article
-     * @param   object  $params   The article params
-     * @param   int     $page     The page number
-     *
-     * @return  string  HTML to prepend to the article
+     * Adds a "Cross-Posting" fieldset to the article attribs tab with:
+     *   - Checkbox list of all enabled services
+     *   - Skip cross-posting toggle
+     */
+    public function onContentPrepareForm(Form $form, $data): void
+    {
+        if ($form->getName() !== 'com_content.article') {
+            return;
+        }
+
+        $app = $this->getApplication();
+
+        if (!$app->isClient('administrator')) {
+            return;
+        }
+
+        $db = Factory::getDbo();
+
+        // Load enabled services for the checkbox list
+        $query = $db->getQuery(true)
+            ->select('id, title, service_type')
+            ->from($db->quoteName('#__mokojoomcross_services'))
+            ->where($db->quoteName('published') . ' = 1')
+            ->order($db->quoteName('ordering') . ' ASC');
+
+        $db->setQuery($query);
+        $services = $db->loadObjectList();
+
+        if (empty($services)) {
+            return;
+        }
+
+        // Build dynamic XML form for the attribs fieldset
+        $options = '';
+
+        foreach ($services as $svc) {
+            $label = htmlspecialchars($svc->title . ' (' . ucfirst($svc->service_type) . ')', ENT_XML1);
+            $options .= '<option value="' . (int) $svc->id . '">' . $label . '</option>';
+        }
+
+        $xml = <<<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+    <fields name="attribs">
+        <fieldset name="mokojoomcross" label="PLG_CONTENT_MOKOJOOMCROSS_FIELDSET_CROSSPOST">
+            <field
+                name="mokojoomcross_skip"
+                type="radio"
+                label="PLG_CONTENT_MOKOJOOMCROSS_SKIP"
+                description="PLG_CONTENT_MOKOJOOMCROSS_SKIP_DESC"
+                default="0"
+                class="btn-group btn-group-yesno">
+                <option value="0">JNO</option>
+                <option value="1">JYES</option>
+            </field>
+            <field
+                name="mokojoomcross_services"
+                type="checkboxes"
+                label="PLG_CONTENT_MOKOJOOMCROSS_SERVICES"
+                description="PLG_CONTENT_MOKOJOOMCROSS_SERVICES_DESC"
+                showon="mokojoomcross_skip:0">
+                {$options}
+            </field>
+        </fieldset>
+    </fields>
+</form>
+XML;
+
+        $form->load($xml);
+    }
+
+    /**
+     * Add cross-post status badges before article content in admin.
     */
    public function onContentBeforeDisplay(string $context, &$article, &$params, int $page = 0): string
    {
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokojoomcross" method="upgrade">
    <name>MokoJoomCross - Bluesky</name>
-    <version>01.00.01-dev</version>
+    <version>01.00.06-dev-dev</version>
    <creationDate>2026-05-28</creationDate>
    <author>Moko Consulting</author>
    <authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -23,4 +23,29 @@
        <language tag="en-GB">language/en-GB/plg_mokojoomcross_bluesky.ini</language>
        <language tag="en-GB">language/en-GB/plg_mokojoomcross_bluesky.sys.ini</language>
    </languages>
+
+    <config>
+        <fields name="params">
+            <fieldset name="basic" label="PLG_MOKOJOOMCROSS_BLUESKY_FIELDSET_DEFAULTS">
+                <field
+                    name="default_pds_url"
+                    type="url"
+                    label="PLG_MOKOJOOMCROSS_BLUESKY_DEFAULT_PDS_URL"
+                    description="PLG_MOKOJOOMCROSS_BLUESKY_DEFAULT_PDS_URL_DESC"
+                    default="https://bsky.social"
+                />
+                <field
+                    name="auto_link_card"
+                    type="radio"
+                    label="PLG_MOKOJOOMCROSS_BLUESKY_AUTO_LINK_CARD"
+                    description="PLG_MOKOJOOMCROSS_BLUESKY_AUTO_LINK_CARD_DESC"
+                    default="1"
+                    class="btn-group btn-group-yesno"
+                >
+                    <option value="0">JNO</option>
+                    <option value="1">JYES</option>
+                </field>
+            </fieldset>
+        </fields>
+    </config>
 </extension>
@@ -1,2 +1,7 @@
 PLG_MOKOJOOMCROSS_BLUESKY="MokoJoomCross - Bluesky"
 PLG_MOKOJOOMCROSS_BLUESKY_DESCRIPTION="Cross-post Joomla articles to Bluesky."
+PLG_MOKOJOOMCROSS_BLUESKY_FIELDSET_DEFAULTS="Bluesky Defaults"
+PLG_MOKOJOOMCROSS_BLUESKY_DEFAULT_PDS_URL="Default PDS URL"
+PLG_MOKOJOOMCROSS_BLUESKY_DEFAULT_PDS_URL_DESC="Default Bluesky PDS URL (e.g. https://bsky.social)."
+PLG_MOKOJOOMCROSS_BLUESKY_AUTO_LINK_CARD="Auto Link Card"
+PLG_MOKOJOOMCROSS_BLUESKY_AUTO_LINK_CARD_DESC="Automatically detect URLs and create link cards in posts."
@@ -17,7 +17,7 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
-use Joomla\Plugin\MokoJoomCross${CLASS_NAME}\Extension${CLASS_NAME}Service;
+use Joomla\Plugin\MokoJoomCross\Bluesky\Extension\BlueskyService;

 return new class () implements ServiceProviderInterface {
    public function register(Container $container): void
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokojoomcross" method="upgrade">
    <name>MokoJoomCross - Discord</name>
-    <version>01.00.01-dev</version>
+    <version>01.00.06-dev-dev</version>
    <creationDate>2026-05-28</creationDate>
    <author>Moko Consulting</author>
    <authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -23,4 +23,24 @@
        <language tag="en-GB">language/en-GB/plg_mokojoomcross_discord.ini</language>
        <language tag="en-GB">language/en-GB/plg_mokojoomcross_discord.sys.ini</language>
    </languages>
+
+    <config>
+        <fields name="params">
+            <fieldset name="basic" label="PLG_MOKOJOOMCROSS_DISCORD_FIELDSET_DEFAULTS">
+                <field
+                    name="default_webhook_url"
+                    type="url"
+                    label="PLG_MOKOJOOMCROSS_DISCORD_DEFAULT_WEBHOOK_URL"
+                    description="PLG_MOKOJOOMCROSS_DISCORD_DEFAULT_WEBHOOK_URL_DESC"
+                />
+                <field
+                    name="embed_color"
+                    type="color"
+                    label="PLG_MOKOJOOMCROSS_DISCORD_EMBED_COLOR"
+                    description="PLG_MOKOJOOMCROSS_DISCORD_EMBED_COLOR_DESC"
+                    default="#5865F2"
+                />
+            </fieldset>
+        </fields>
+    </config>
 </extension>
@@ -1,2 +1,7 @@
 PLG_MOKOJOOMCROSS_DISCORD="MokoJoomCross - Discord"
 PLG_MOKOJOOMCROSS_DISCORD_DESCRIPTION="Cross-post Joomla articles to Discord."
+PLG_MOKOJOOMCROSS_DISCORD_FIELDSET_DEFAULTS="Default Settings"
+PLG_MOKOJOOMCROSS_DISCORD_DEFAULT_WEBHOOK_URL="Default Webhook URL"
+PLG_MOKOJOOMCROSS_DISCORD_DEFAULT_WEBHOOK_URL_DESC="The default MokoWaaS Discord webhook URL used when a service is set to 'default' mode."
+PLG_MOKOJOOMCROSS_DISCORD_EMBED_COLOR="Embed Color"
+PLG_MOKOJOOMCROSS_DISCORD_EMBED_COLOR_DESC="Default color for Discord embed messages. Defaults to Discord blurple (#5865F2)."
@@ -17,7 +17,7 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
-use Joomla\Plugin\MokoJoomCross${CLASS_NAME}\Extension${CLASS_NAME}Service;
+use Joomla\Plugin\MokoJoomCross\Discord\Extension\DiscordService;

 return new class () implements ServiceProviderInterface {
    public function register(Container $container): void
@@ -113,7 +113,6 @@ class DiscordService extends CMSPlugin implements SubscriberInterface, MokoJoomC
            return $credentials['webhook_url'] ?? '';
        }

-        return \Joomla\CMS\Component\ComponentHelper::getParams('com_mokojoomcross')
-            ->get('discord_default_webhook', '');
+        return $this->params->get('default_webhook_url', '');
    }
 }
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokojoomcross" method="upgrade">
    <name>MokoJoomCross - Facebook / Meta</name>
-    <version>01.00.01-dev</version>
+    <version>01.00.06-dev-dev</version>
    <creationDate>2026-05-28</creationDate>
    <author>Moko Consulting</author>
    <authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -23,4 +23,23 @@
        <language tag="en-GB">language/en-GB/plg_mokojoomcross_facebook.ini</language>
        <language tag="en-GB">language/en-GB/plg_mokojoomcross_facebook.sys.ini</language>
    </languages>
+
+    <config>
+        <fields name="params">
+            <fieldset name="basic" label="PLG_MOKOJOOMCROSS_FACEBOOK_FIELDSET_DEFAULTS">
+                <field
+                    name="default_page_access_token"
+                    type="password"
+                    label="PLG_MOKOJOOMCROSS_FACEBOOK_DEFAULT_PAGE_ACCESS_TOKEN"
+                    description="PLG_MOKOJOOMCROSS_FACEBOOK_DEFAULT_PAGE_ACCESS_TOKEN_DESC"
+                />
+                <field
+                    name="default_page_id"
+                    type="text"
+                    label="PLG_MOKOJOOMCROSS_FACEBOOK_DEFAULT_PAGE_ID"
+                    description="PLG_MOKOJOOMCROSS_FACEBOOK_DEFAULT_PAGE_ID_DESC"
+                />
+            </fieldset>
+        </fields>
+    </config>
 </extension>
@@ -1,2 +1,7 @@
 PLG_MOKOJOOMCROSS_FACEBOOK="MokoJoomCross - Facebook / Meta"
 PLG_MOKOJOOMCROSS_FACEBOOK_DESCRIPTION="Cross-post Joomla articles to Facebook / Meta."
+PLG_MOKOJOOMCROSS_FACEBOOK_FIELDSET_DEFAULTS="Default Settings"
+PLG_MOKOJOOMCROSS_FACEBOOK_DEFAULT_PAGE_ACCESS_TOKEN="Default Page Access Token"
+PLG_MOKOJOOMCROSS_FACEBOOK_DEFAULT_PAGE_ACCESS_TOKEN_DESC="The default MokoWaaS Facebook Page Access Token used when a service is set to 'default' mode."
+PLG_MOKOJOOMCROSS_FACEBOOK_DEFAULT_PAGE_ID="Default Page ID"
+PLG_MOKOJOOMCROSS_FACEBOOK_DEFAULT_PAGE_ID_DESC="The default Facebook Page ID used when a service is set to 'default' mode."
@@ -17,7 +17,7 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
-use Joomla\Plugin\MokoJoomCross${CLASS_NAME}\Extension${CLASS_NAME}Service;
+use Joomla\Plugin\MokoJoomCross\Facebook\Extension\FacebookService;

 return new class () implements ServiceProviderInterface {
    public function register(Container $container): void
@@ -139,7 +139,6 @@ class FacebookService extends CMSPlugin implements SubscriberInterface, MokoJoom
            return $credentials['page_access_token'] ?? '';
        }

-        return \Joomla\CMS\Component\ComponentHelper::getParams('com_mokojoomcross')
-            ->get('facebook_default_token', '');
+        return $this->params->get('default_page_access_token', '');
    }
 }
@@ -1,2 +1,9 @@
 PLG_MOKOJOOMCROSS_LINKEDIN="MokoJoomCross - LinkedIn"
 PLG_MOKOJOOMCROSS_LINKEDIN_DESCRIPTION="Cross-post Joomla articles to LinkedIn."
+PLG_MOKOJOOMCROSS_LINKEDIN_FIELDSET_DEFAULTS="LinkedIn Defaults"
+PLG_MOKOJOOMCROSS_LINKEDIN_CLIENT_ID="Client ID"
+PLG_MOKOJOOMCROSS_LINKEDIN_CLIENT_ID_DESC="LinkedIn App Client ID."
+PLG_MOKOJOOMCROSS_LINKEDIN_CLIENT_SECRET="Client Secret"
+PLG_MOKOJOOMCROSS_LINKEDIN_CLIENT_SECRET_DESC="LinkedIn App Client Secret."
+PLG_MOKOJOOMCROSS_LINKEDIN_REDIRECT_URI="Redirect URI"
+PLG_MOKOJOOMCROSS_LINKEDIN_REDIRECT_URI_DESC="OAuth callback URL for LinkedIn authentication."
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokojoomcross" method="upgrade">
    <name>MokoJoomCross - LinkedIn</name>
-    <version>01.00.01-dev</version>
+    <version>01.00.06-dev-dev</version>
    <creationDate>2026-05-28</creationDate>
    <author>Moko Consulting</author>
    <authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -23,4 +23,29 @@
        <language tag="en-GB">language/en-GB/plg_mokojoomcross_linkedin.ini</language>
        <language tag="en-GB">language/en-GB/plg_mokojoomcross_linkedin.sys.ini</language>
    </languages>
+
+    <config>
+        <fields name="params">
+            <fieldset name="basic" label="PLG_MOKOJOOMCROSS_LINKEDIN_FIELDSET_DEFAULTS">
+                <field
+                    name="client_id"
+                    type="text"
+                    label="PLG_MOKOJOOMCROSS_LINKEDIN_CLIENT_ID"
+                    description="PLG_MOKOJOOMCROSS_LINKEDIN_CLIENT_ID_DESC"
+                />
+                <field
+                    name="client_secret"
+                    type="password"
+                    label="PLG_MOKOJOOMCROSS_LINKEDIN_CLIENT_SECRET"
+                    description="PLG_MOKOJOOMCROSS_LINKEDIN_CLIENT_SECRET_DESC"
+                />
+                <field
+                    name="redirect_uri"
+                    type="url"
+                    label="PLG_MOKOJOOMCROSS_LINKEDIN_REDIRECT_URI"
+                    description="PLG_MOKOJOOMCROSS_LINKEDIN_REDIRECT_URI_DESC"
+                />
+            </fieldset>
+        </fields>
+    </config>
 </extension>
@@ -17,7 +17,7 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
-use Joomla\Plugin\MokoJoomCross${CLASS_NAME}\Extension${CLASS_NAME}Service;
+use Joomla\Plugin\MokoJoomCross\Linkedin\Extension\LinkedinService;

 return new class () implements ServiceProviderInterface {
    public function register(Container $container): void
@@ -1,2 +1,9 @@
 PLG_MOKOJOOMCROSS_MAILCHIMP="MokoJoomCross - Mailchimp"
 PLG_MOKOJOOMCROSS_MAILCHIMP_DESCRIPTION="Cross-post Joomla articles to Mailchimp."
+PLG_MOKOJOOMCROSS_MAILCHIMP_FIELDSET_DEFAULTS="Mailchimp Defaults"
+PLG_MOKOJOOMCROSS_MAILCHIMP_DEFAULT_FROM_NAME="Default From Name"
+PLG_MOKOJOOMCROSS_MAILCHIMP_DEFAULT_FROM_NAME_DESC="Default sender name for Mailchimp campaigns."
+PLG_MOKOJOOMCROSS_MAILCHIMP_DEFAULT_FROM_EMAIL="Default From Email"
+PLG_MOKOJOOMCROSS_MAILCHIMP_DEFAULT_FROM_EMAIL_DESC="Default sender email address for Mailchimp campaigns."
+PLG_MOKOJOOMCROSS_MAILCHIMP_AUTO_SEND="Auto Send"
+PLG_MOKOJOOMCROSS_MAILCHIMP_AUTO_SEND_DESC="Automatically send the campaign on creation instead of saving as draft."
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokojoomcross" method="upgrade">
    <name>MokoJoomCross - Mailchimp</name>
-    <version>01.00.01-dev</version>
+    <version>01.00.06-dev-dev</version>
    <creationDate>2026-05-28</creationDate>
    <author>Moko Consulting</author>
    <authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -23,4 +23,34 @@
        <language tag="en-GB">language/en-GB/plg_mokojoomcross_mailchimp.ini</language>
        <language tag="en-GB">language/en-GB/plg_mokojoomcross_mailchimp.sys.ini</language>
    </languages>
+
+    <config>
+        <fields name="params">
+            <fieldset name="basic" label="PLG_MOKOJOOMCROSS_MAILCHIMP_FIELDSET_DEFAULTS">
+                <field
+                    name="default_from_name"
+                    type="text"
+                    label="PLG_MOKOJOOMCROSS_MAILCHIMP_DEFAULT_FROM_NAME"
+                    description="PLG_MOKOJOOMCROSS_MAILCHIMP_DEFAULT_FROM_NAME_DESC"
+                />
+                <field
+                    name="default_from_email"
+                    type="email"
+                    label="PLG_MOKOJOOMCROSS_MAILCHIMP_DEFAULT_FROM_EMAIL"
+                    description="PLG_MOKOJOOMCROSS_MAILCHIMP_DEFAULT_FROM_EMAIL_DESC"
+                />
+                <field
+                    name="auto_send"
+                    type="radio"
+                    label="PLG_MOKOJOOMCROSS_MAILCHIMP_AUTO_SEND"
+                    description="PLG_MOKOJOOMCROSS_MAILCHIMP_AUTO_SEND_DESC"
+                    default="0"
+                    class="btn-group btn-group-yesno"
+                >
+                    <option value="0">JNO</option>
+                    <option value="1">JYES</option>
+                </field>
+            </fieldset>
+        </fields>
+    </config>
 </extension>
@@ -17,7 +17,7 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
-use Joomla\Plugin\MokoJoomCross${CLASS_NAME}\Extension${CLASS_NAME}Service;
+use Joomla\Plugin\MokoJoomCross\Mailchimp\Extension\MailchimpService;

 return new class () implements ServiceProviderInterface {
    public function register(Container $container): void
@@ -1,2 +1,13 @@
 PLG_MOKOJOOMCROSS_MASTODON="MokoJoomCross - Mastodon"
 PLG_MOKOJOOMCROSS_MASTODON_DESCRIPTION="Cross-post Joomla articles to Mastodon."
+PLG_MOKOJOOMCROSS_MASTODON_FIELDSET_DEFAULTS="Mastodon Defaults"
+PLG_MOKOJOOMCROSS_MASTODON_DEFAULT_INSTANCE_URL="Default Instance URL"
+PLG_MOKOJOOMCROSS_MASTODON_DEFAULT_INSTANCE_URL_DESC="Default Mastodon instance URL (e.g. https://mastodon.social)."
+PLG_MOKOJOOMCROSS_MASTODON_DEFAULT_VISIBILITY="Default Visibility"
+PLG_MOKOJOOMCROSS_MASTODON_DEFAULT_VISIBILITY_DESC="Default post visibility for Mastodon toots."
+PLG_MOKOJOOMCROSS_MASTODON_VISIBILITY_PUBLIC="Public"
+PLG_MOKOJOOMCROSS_MASTODON_VISIBILITY_UNLISTED="Unlisted"
+PLG_MOKOJOOMCROSS_MASTODON_VISIBILITY_PRIVATE="Private"
+PLG_MOKOJOOMCROSS_MASTODON_VISIBILITY_DIRECT="Direct"
+PLG_MOKOJOOMCROSS_MASTODON_APPEND_HASHTAGS="Append Hashtags"
+PLG_MOKOJOOMCROSS_MASTODON_APPEND_HASHTAGS_DESC="Default hashtags to append to posts (e.g. #Joomla #MokoWaaS)."
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokojoomcross" method="upgrade">
    <name>MokoJoomCross - Mastodon</name>
-    <version>01.00.01-dev</version>
+    <version>01.00.06-dev-dev</version>
    <creationDate>2026-05-28</creationDate>
    <author>Moko Consulting</author>
    <authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -23,4 +23,35 @@
        <language tag="en-GB">language/en-GB/plg_mokojoomcross_mastodon.ini</language>
        <language tag="en-GB">language/en-GB/plg_mokojoomcross_mastodon.sys.ini</language>
    </languages>
+
+    <config>
+        <fields name="params">
+            <fieldset name="basic" label="PLG_MOKOJOOMCROSS_MASTODON_FIELDSET_DEFAULTS">
+                <field
+                    name="default_instance_url"
+                    type="url"
+                    label="PLG_MOKOJOOMCROSS_MASTODON_DEFAULT_INSTANCE_URL"
+                    description="PLG_MOKOJOOMCROSS_MASTODON_DEFAULT_INSTANCE_URL_DESC"
+                />
+                <field
+                    name="default_visibility"
+                    type="list"
+                    label="PLG_MOKOJOOMCROSS_MASTODON_DEFAULT_VISIBILITY"
+                    description="PLG_MOKOJOOMCROSS_MASTODON_DEFAULT_VISIBILITY_DESC"
+                    default="public"
+                >
+                    <option value="public">PLG_MOKOJOOMCROSS_MASTODON_VISIBILITY_PUBLIC</option>
+                    <option value="unlisted">PLG_MOKOJOOMCROSS_MASTODON_VISIBILITY_UNLISTED</option>
+                    <option value="private">PLG_MOKOJOOMCROSS_MASTODON_VISIBILITY_PRIVATE</option>
+                    <option value="direct">PLG_MOKOJOOMCROSS_MASTODON_VISIBILITY_DIRECT</option>
+                </field>
+                <field
+                    name="append_hashtags"
+                    type="text"
+                    label="PLG_MOKOJOOMCROSS_MASTODON_APPEND_HASHTAGS"
+                    description="PLG_MOKOJOOMCROSS_MASTODON_APPEND_HASHTAGS_DESC"
+                />
+            </fieldset>
+        </fields>
+    </config>
 </extension>
@@ -17,7 +17,7 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
-use Joomla\Plugin\MokoJoomCross${CLASS_NAME}\Extension${CLASS_NAME}Service;
+use Joomla\Plugin\MokoJoomCross\Mastodon\Extension\MastodonService;

 return new class () implements ServiceProviderInterface {
    public function register(Container $container): void
@@ -1,2 +1,5 @@
 PLG_MOKOJOOMCROSS_SLACK="MokoJoomCross - Slack"
 PLG_MOKOJOOMCROSS_SLACK_DESCRIPTION="Cross-post Joomla articles to Slack."
+PLG_MOKOJOOMCROSS_SLACK_FIELDSET_DEFAULTS="Default Settings"
+PLG_MOKOJOOMCROSS_SLACK_DEFAULT_WEBHOOK_URL="Default Webhook URL"
+PLG_MOKOJOOMCROSS_SLACK_DEFAULT_WEBHOOK_URL_DESC="The default MokoWaaS Slack webhook URL used when a service is set to 'default' mode."
@@ -17,7 +17,7 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
-use Joomla\Plugin\MokoJoomCross${CLASS_NAME}\Extension${CLASS_NAME}Service;
+use Joomla\Plugin\MokoJoomCross\Slack\Extension\SlackService;

 return new class () implements ServiceProviderInterface {
    public function register(Container $container): void
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokojoomcross" method="upgrade">
    <name>MokoJoomCross - Slack</name>
-    <version>01.00.01-dev</version>
+    <version>01.00.06-dev-dev</version>
    <creationDate>2026-05-28</creationDate>
    <author>Moko Consulting</author>
    <authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -23,4 +23,17 @@
        <language tag="en-GB">language/en-GB/plg_mokojoomcross_slack.ini</language>
        <language tag="en-GB">language/en-GB/plg_mokojoomcross_slack.sys.ini</language>
    </languages>
+
+    <config>
+        <fields name="params">
+            <fieldset name="basic" label="PLG_MOKOJOOMCROSS_SLACK_FIELDSET_DEFAULTS">
+                <field
+                    name="default_webhook_url"
+                    type="url"
+                    label="PLG_MOKOJOOMCROSS_SLACK_DEFAULT_WEBHOOK_URL"
+                    description="PLG_MOKOJOOMCROSS_SLACK_DEFAULT_WEBHOOK_URL_DESC"
+                />
+            </fieldset>
+        </fields>
+    </config>
 </extension>
@@ -111,7 +111,6 @@ class SlackService extends CMSPlugin implements SubscriberInterface, MokoJoomCro
            return $credentials['webhook_url'] ?? '';
        }

-        return \Joomla\CMS\Component\ComponentHelper::getParams('com_mokojoomcross')
-            ->get('slack_default_webhook', '');
+        return $this->params->get('default_webhook_url', '');
    }
 }
@@ -1,2 +1,9 @@
 PLG_MOKOJOOMCROSS_TELEGRAM="MokoJoomCross - Telegram"
-PLG_MOKOJOOMCROSS_TELEGRAM_DESCRIPTION="Cross-post Joomla articles to Telegram."
+PLG_MOKOJOOMCROSS_TELEGRAM_DESCRIPTION="Cross-post Joomla articles to Telegram channels and groups. Supports default @MokoWaaSBot and custom bot modes."
+PLG_MOKOJOOMCROSS_TELEGRAM_FIELDSET_DEFAULTS="Default Bot Settings"
+PLG_MOKOJOOMCROSS_TELEGRAM_DEFAULT_BOT_TOKEN="Default Bot Token"
+PLG_MOKOJOOMCROSS_TELEGRAM_DEFAULT_BOT_TOKEN_DESC="Bot API token for the default MokoWaaS bot. Services using 'default' mode will use this token. Leave empty to require custom tokens on each service."
+PLG_MOKOJOOMCROSS_TELEGRAM_PARSE_MODE="Message Format"
+PLG_MOKOJOOMCROSS_TELEGRAM_PARSE_MODE_DESC="How Telegram parses formatting in messages."
+PLG_MOKOJOOMCROSS_TELEGRAM_DISABLE_PREVIEW="Disable Link Preview"
+PLG_MOKOJOOMCROSS_TELEGRAM_DISABLE_PREVIEW_DESC="Disable automatic link preview in Telegram messages."
@@ -17,7 +17,7 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
-use Joomla\Plugin\MokoJoomCross${CLASS_NAME}\Extension${CLASS_NAME}Service;
+use Joomla\Plugin\MokoJoomCross\Telegram\Extension\TelegramService;

 return new class () implements ServiceProviderInterface {
    public function register(Container $container): void
@@ -181,9 +181,7 @@ class TelegramService extends CMSPlugin implements SubscriberInterface, MokoJoom
            return $credentials['bot_token'] ?? '';
        }

-        // Default mode — load from component encrypted params
-        $componentParams = \Joomla\CMS\Component\ComponentHelper::getParams('com_mokojoomcross');
-
-        return $componentParams->get('telegram_default_bot_token', '');
+        // Default mode — load from plugin params (set in Extensions → Plugins → MokoJoomCross - Telegram)
+        return $this->params->get('default_bot_token', '');
    }
 }
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokojoomcross" method="upgrade">
    <name>MokoJoomCross - Telegram</name>
-    <version>01.00.01-dev</version>
+    <version>01.00.06-dev-dev</version>
    <creationDate>2026-05-28</creationDate>
    <author>Moko Consulting</author>
    <authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -17,7 +17,7 @@ use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
-use Joomla\Plugin\MokoJoomCross${CLASS_NAME}\Extension${CLASS_NAME}Service;
+use Joomla\Plugin\MokoJoomCross\Twitter\Extension\TwitterService;

 return new class () implements ServiceProviderInterface {
    public function register(Container $container): void
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokojoomcross" method="upgrade">
    <name>MokoJoomCross - X / Twitter</name>
-    <version>01.00.01-dev</version>
+    <version>01.00.06-dev-dev</version>
    <creationDate>2026-05-28</creationDate>
    <author>Moko Consulting</author>
    <authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="system" method="upgrade">
    <name>System - MokoJoomCross</name>
-    <version>01.00.01-dev</version>
+    <version>01.00.06-dev-dev</version>
    <creationDate>2026-05-28</creationDate>
    <author>Moko Consulting</author>
    <authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -17,47 +17,120 @@ use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Uri\Uri;
 use Joomla\Component\MokoJoomCross\Administrator\Service\MokoJoomCrossServiceInterface;
 use Joomla\Event\SubscriberInterface;

 /**
 * System plugin that triggers cross-posting when Joomla articles are published.
 *
- * Listens for onContentAfterSave events on com_content articles. When an article
- * transitions to published state, it dispatches the post to all enabled service
- * plugins in the `mokojoomcross` plugin group.
+ * Flow:
+ *   1. Article saved → onContentAfterSave fires
+ *   2. Check: is it a com_content article? Is it published? Is auto-post enabled?
+ *   3. Load enabled services from #__mokojoomcross_services
+ *   4. Skip services that already have a post for this article (duplicate guard)
+ *   5. Render message template with article placeholders
+ *   6. Queue post record, then immediately attempt dispatch to the service plugin
+ *   7. Service plugin calls the platform API and returns success/failure
+ *   8. Update post status and log the result
 */
 class MokoJoomCross extends CMSPlugin implements SubscriberInterface
 {
    public static function getSubscribedEvents(): array
    {
        return [
-            'onContentAfterSave' => 'onContentAfterSave',
+            'onContentAfterSave'       => 'onContentAfterSave',
+            'onContentChangeState'     => 'onContentChangeState',
+            'onAfterRender'            => 'onAfterRender',
        ];
    }

+    /**
+     * Process queued posts on page load (backend and/or frontend).
+     *
+     * Only runs if page-load processing is enabled in component config,
+     * and only once per throttle interval (default 5 minutes).
+     */
+    public function onAfterRender(): void
+    {
+        $componentParams = ComponentHelper::getParams('com_mokojoomcross');
+        $processingMode  = $componentParams->get('queue_processing', 'scheduler');
+
+        if ($processingMode !== 'pageload' && $processingMode !== 'both') {
+            return;
+        }
+
+        $app = $this->getApplication();
+
+        $pageloadClient = $componentParams->get('pageload_client', 'both');
+
+        if ($pageloadClient === 'admin' && !$app->isClient('administrator')) {
+            return;
+        }
+
+        if ($pageloadClient === 'site' && !$app->isClient('site')) {
+            return;
+        }
+
+        // Throttle: only run once per interval
+        $throttleSeconds = (int) $componentParams->get('pageload_interval', 300);
+        $lastRun = (int) $componentParams->get('_pageload_last_run', 0);
+
+        if ((time() - $lastRun) < $throttleSeconds) {
+            return;
+        }
+
+        if (!\Joomla\Component\MokoJoomCross\Administrator\Helper\QueueProcessor::hasPendingWork()) {
+            return;
+        }
+
+        $this->updateLastRunTimestamp();
+
+        // Small batch to avoid slowing page loads
+        \Joomla\Component\MokoJoomCross\Administrator\Helper\QueueProcessor::processQueue(5);
+    }
+
+    /**
+     * Store the last page-load run timestamp.
+     */
+    private function updateLastRunTimestamp(): void
+    {
+        $db = Factory::getDbo();
+
+        $query = $db->getQuery(true)
+            ->select($db->quoteName('params'))
+            ->from($db->quoteName('#__extensions'))
+            ->where($db->quoteName('type') . ' = ' . $db->quote('component'))
+            ->where($db->quoteName('element') . ' = ' . $db->quote('com_mokojoomcross'));
+
+        $db->setQuery($query);
+        $params = json_decode($db->loadResult() ?: '{}', true) ?: [];
+        $params['_pageload_last_run'] = time();
+
+        $query = $db->getQuery(true)
+            ->update($db->quoteName('#__extensions'))
+            ->set($db->quoteName('params') . ' = ' . $db->quote(json_encode($params)))
+            ->where($db->quoteName('type') . ' = ' . $db->quote('component'))
+            ->where($db->quoteName('element') . ' = ' . $db->quote('com_mokojoomcross'));
+
+        $db->setQuery($query);
+        $db->execute();
+    }
+
    /**
     * Triggered after a content item is saved.
-     *
-     * @param   string  $context  The context (e.g. 'com_content.article')
-     * @param   object  $article  The article object
-     * @param   bool    $isNew    Whether this is a new article
-     *
-     * @return  void
     */
    public function onContentAfterSave(string $context, $article, bool $isNew): void
    {
-        // Only process Joomla articles
        if ($context !== 'com_content.article') {
            return;
        }

-        // Only cross-post when article is published
        if ((int) ($article->state ?? 0) !== 1) {
            return;
        }

-        // Check global auto-post setting
        $componentParams = ComponentHelper::getParams('com_mokojoomcross');

        if (!$componentParams->get('auto_post_on_publish', 1)) {
@@ -67,12 +140,39 @@ class MokoJoomCross extends CMSPlugin implements SubscriberInterface
        $this->dispatchCrossPost($article);
    }

+    /**
+     * Triggered when article state changes (e.g. unpublished → published via list toggle).
+     */
+    public function onContentChangeState(string $context, array $pks, int $value): void
+    {
+        if ($context !== 'com_content.article' || $value !== 1) {
+            return;
+        }
+
+        $componentParams = ComponentHelper::getParams('com_mokojoomcross');
+
+        if (!$componentParams->get('auto_post_on_publish', 1)) {
+            return;
+        }
+
+        $db = Factory::getDbo();
+
+        foreach ($pks as $pk) {
+            $query = $db->getQuery(true)
+                ->select('*')
+                ->from($db->quoteName('#__content'))
+                ->where($db->quoteName('id') . ' = ' . (int) $pk);
+            $db->setQuery($query);
+            $article = $db->loadObject();
+
+            if ($article) {
+                $this->dispatchCrossPost($article);
+            }
+        }
+    }
+
    /**
     * Dispatch article to all enabled service plugins.
-     *
-     * @param   object  $article  The article object
-     *
-     * @return  void
     */
    private function dispatchCrossPost(object $article): void
    {
@@ -92,43 +192,168 @@ class MokoJoomCross extends CMSPlugin implements SubscriberInterface
            return;
        }

-        // Import service plugins
+        // Import service plugins so they register with the dispatcher
        PluginHelper::importPlugin('mokojoomcross');

+        // Collect registered service plugin instances
+        $servicePlugins = [];
+        $this->getApplication()->getDispatcher()->dispatch(
+            'onMokoJoomCrossGetServices',
+            new \Joomla\Event\Event('onMokoJoomCrossGetServices', [&$servicePlugins])
+        );
+
+        // Index by service type for lookup
+        $pluginMap = [];
+
+        foreach ($servicePlugins as $plugin) {
+            if ($plugin instanceof MokoJoomCrossServiceInterface) {
+                $pluginMap[$plugin->getServiceType()] = $plugin;
+            }
+        }
+
+        $componentParams = ComponentHelper::getParams('com_mokojoomcross');
+        $maxRetry = (int) $componentParams->get('retry_max', 3);
+
+        // Per-article selective cross-posting (#19)
+        // If article attribs contain mokojoomcross_services, only post to those service IDs.
+        // If mokojoomcross_skip is set, skip cross-posting entirely.
+        $attribs = json_decode($article->attribs ?? '{}', true) ?: [];
+        $selectedServiceIds = $attribs['mokojoomcross_services'] ?? null;
+        $skipCrossPost      = !empty($attribs['mokojoomcross_skip']);
+
+        if ($skipCrossPost) {
+            return;
+        }
+
+        // If specific services selected, convert to array of ints for filtering
+        if (is_array($selectedServiceIds) && !empty($selectedServiceIds)) {
+            $selectedServiceIds = array_map('intval', $selectedServiceIds);
+        } else {
+            $selectedServiceIds = null; // null = post to all
+        }
+
        foreach ($services as $service) {
-            // Queue the post
+            // Per-article filter: skip if article specifies services and this one isn't in the list
+            if ($selectedServiceIds !== null && !in_array((int) $service->id, $selectedServiceIds, true)) {
+                continue;
+            }
+
+            // Duplicate guard — skip if article already posted/queued for this service
+            $query = $db->getQuery(true)
+                ->select('COUNT(*)')
+                ->from($db->quoteName('#__mokojoomcross_posts'))
+                ->where($db->quoteName('article_id') . ' = ' . (int) $article->id)
+                ->where($db->quoteName('service_id') . ' = ' . (int) $service->id)
+                ->where($db->quoteName('status') . ' IN (' . $db->quote('queued') . ',' . $db->quote('posted') . ',' . $db->quote('posting') . ')');
+
+            $db->setQuery($query);
+
+            if ((int) $db->loadResult() > 0) {
+                continue;
+            }
+
+            $message = $this->renderTemplate($article, $service);
+
+            // Create queue entry
            $post = (object) [
-                'article_id'  => $article->id,
-                'service_id'  => $service->id,
-                'status'      => 'queued',
-                'message'     => $this->renderTemplate($article, $service),
-                'created'     => Factory::getDate()->toSql(),
-                'modified'    => Factory::getDate()->toSql(),
+                'article_id'    => (int) $article->id,
+                'service_id'    => (int) $service->id,
+                'status'        => 'queued',
+                'message'       => $message,
+                'platform_post_id'   => '',
+                'platform_response'  => '',
+                'error_message'      => '',
+                'retry_count'   => 0,
+                'created'       => Factory::getDate()->toSql(),
+                'modified'      => Factory::getDate()->toSql(),
            ];

            $db->insertObject('#__mokojoomcross_posts', $post);
+            $postId = $db->insertid();

-            // Log the queue action
-            $log = (object) [
-                'post_id'    => $db->insertid(),
-                'service_id' => $service->id,
-                'level'      => 'info',
-                'message'    => sprintf('Article "%s" queued for %s', $article->title, $service->service_type),
-                'context'    => json_encode(['article_id' => $article->id]),
-                'created'    => Factory::getDate()->toSql(),
-            ];
+            // Attempt immediate dispatch if service plugin is available
+            $plugin = $pluginMap[$service->service_type] ?? null;

-            $db->insertObject('#__mokojoomcross_logs', $log);
+            if ($plugin) {
+                $this->executePost($db, $postId, $plugin, $message, $service);
+            } else {
+                $this->log($db, $postId, $service->id, 'warning',
+                    sprintf('No service plugin found for type "%s" — post remains queued', $service->service_type));
+            }
+        }
+    }
+
+    /**
+     * Execute a cross-post via the service plugin.
+     */
+    private function executePost($db, int $postId, MokoJoomCrossServiceInterface $plugin, string $message, object $service): void
+    {
+        // Mark as posting
+        $db->setQuery(
+            $db->getQuery(true)
+                ->update($db->quoteName('#__mokojoomcross_posts'))
+                ->set($db->quoteName('status') . ' = ' . $db->quote('posting'))
+                ->set($db->quoteName('modified') . ' = ' . $db->quote(Factory::getDate()->toSql()))
+                ->where($db->quoteName('id') . ' = ' . $postId)
+        );
+        $db->execute();
+
+        $credentials = json_decode($service->credentials ?: '{}', true) ?: [];
+        $params      = json_decode($service->params ?: '{}', true) ?: [];
+
+        try {
+            $result = $plugin->publish($message, [], $credentials, $params);
+
+            if (!empty($result['success'])) {
+                $db->setQuery(
+                    $db->getQuery(true)
+                        ->update($db->quoteName('#__mokojoomcross_posts'))
+                        ->set($db->quoteName('status') . ' = ' . $db->quote('posted'))
+                        ->set($db->quoteName('platform_post_id') . ' = ' . $db->quote($result['platform_post_id'] ?? ''))
+                        ->set($db->quoteName('platform_response') . ' = ' . $db->quote(json_encode($result['response'] ?? [])))
+                        ->set($db->quoteName('posted_at') . ' = ' . $db->quote(Factory::getDate()->toSql()))
+                        ->set($db->quoteName('modified') . ' = ' . $db->quote(Factory::getDate()->toSql()))
+                        ->where($db->quoteName('id') . ' = ' . $postId)
+                );
+                $db->execute();
+
+                $this->log($db, $postId, $service->id, 'info',
+                    sprintf('Posted to %s (platform ID: %s)', $service->service_type, $result['platform_post_id'] ?? 'n/a'));
+            } else {
+                $errorMsg = $result['response']['error'] ?? json_encode($result['response'] ?? []);
+
+                $db->setQuery(
+                    $db->getQuery(true)
+                        ->update($db->quoteName('#__mokojoomcross_posts'))
+                        ->set($db->quoteName('status') . ' = ' . $db->quote('failed'))
+                        ->set($db->quoteName('error_message') . ' = ' . $db->quote(mb_substr($errorMsg, 0, 1000)))
+                        ->set($db->quoteName('platform_response') . ' = ' . $db->quote(json_encode($result['response'] ?? [])))
+                        ->set($db->quoteName('modified') . ' = ' . $db->quote(Factory::getDate()->toSql()))
+                        ->where($db->quoteName('id') . ' = ' . $postId)
+                );
+                $db->execute();
+
+                $this->log($db, $postId, $service->id, 'error',
+                    sprintf('Failed to post to %s: %s', $service->service_type, $errorMsg));
+            }
+        } catch (\Throwable $e) {
+            $db->setQuery(
+                $db->getQuery(true)
+                    ->update($db->quoteName('#__mokojoomcross_posts'))
+                    ->set($db->quoteName('status') . ' = ' . $db->quote('failed'))
+                    ->set($db->quoteName('error_message') . ' = ' . $db->quote(mb_substr($e->getMessage(), 0, 1000)))
+                    ->set($db->quoteName('modified') . ' = ' . $db->quote(Factory::getDate()->toSql()))
+                    ->where($db->quoteName('id') . ' = ' . $postId)
+            );
+            $db->execute();
+
+            $this->log($db, $postId, $service->id, 'error',
+                sprintf('Exception posting to %s: %s', $service->service_type, $e->getMessage()));
        }
    }

    /**
     * Render the message template for a service.
-     *
-     * @param   object  $article  The article
-     * @param   object  $service  The service record
-     *
-     * @return  string  Rendered message
     */
    private function renderTemplate(object $article, object $service): string
    {
@@ -146,21 +371,76 @@ class MokoJoomCross extends CMSPlugin implements SubscriberInterface
            ->setLimit(1);

        $db->setQuery($query);
-        $template = $db->loadResult() ?: '{title}\n\n{url}';
+        $template = $db->loadResult() ?: "{title}\n\n{url}";

-        // Build article URL
-        $url = \Joomla\CMS\Uri\Uri::root() . 'index.php?option=com_content&view=article&id=' . $article->id;
+        // Build SEF article URL
+        $url = Uri::root() . 'index.php?option=com_content&view=article&id=' . $article->id;
+
+        if (!empty($article->catid)) {
+            $url .= '&catid=' . $article->catid;
+        }
+
+        // Resolve category name
+        $categoryName = '';
+
+        if (!empty($article->catid)) {
+            $query = $db->getQuery(true)
+                ->select($db->quoteName('title'))
+                ->from($db->quoteName('#__categories'))
+                ->where($db->quoteName('id') . ' = ' . (int) $article->catid);
+            $db->setQuery($query);
+            $categoryName = $db->loadResult() ?: '';
+        }
+
+        // Resolve author name
+        $authorName = '';
+
+        if (!empty($article->created_by)) {
+            $query = $db->getQuery(true)
+                ->select($db->quoteName('name'))
+                ->from($db->quoteName('#__users'))
+                ->where($db->quoteName('id') . ' = ' . (int) $article->created_by);
+            $db->setQuery($query);
+            $authorName = $db->loadResult() ?: '';
+        }
+
+        // Extract intro image
+        $introImage = '';
+        $images = json_decode($article->images ?? '{}');
+
+        if (!empty($images->image_intro)) {
+            $introImage = Uri::root() . ltrim($images->image_intro, '/');
+        }

        // Replace placeholders
        $replacements = [
            '{title}'     => $article->title ?? '',
            '{introtext}' => strip_tags(mb_substr($article->introtext ?? '', 0, 280)),
+            '{fulltext}'  => strip_tags(mb_substr($article->fulltext ?? '', 0, 500)),
            '{url}'       => $url,
-            '{image}'     => json_decode($article->images ?? '{}')->image_intro ?? '',
-            '{category}'  => '',
-            '{author}'    => '',
+            '{image}'     => $introImage,
+            '{category}'  => $categoryName,
+            '{author}'    => $authorName,
+            '{date}'      => Factory::getDate($article->publish_up ?? 'now')->format('Y-m-d'),
        ];

        return str_replace(array_keys($replacements), array_values($replacements), $template);
    }
+
+    /**
+     * Write an entry to the activity log.
+     */
+    private function log($db, ?int $postId, ?int $serviceId, string $level, string $message): void
+    {
+        $log = (object) [
+            'post_id'    => $postId,
+            'service_id' => $serviceId,
+            'level'      => $level,
+            'message'    => mb_substr($message, 0, 2000),
+            'context'    => '{}',
+            'created'    => Factory::getDate()->toSql(),
+        ];
+
+        $db->insertObject('#__mokojoomcross_logs', $log);
+    }
 }
@@ -0,0 +1 @@
+<\!DOCTYPE html><title></title>
@@ -0,0 +1 @@
+<\!DOCTYPE html><title></title>
@@ -0,0 +1,9 @@
+; Task - MokoJoomCross Queue Processor Language File
+; Copyright (C) 2026 Moko Consulting. All rights reserved.
+; License: GPL-3.0-or-later
+
+PLG_TASK_MOKOJOOMCROSS="Task - MokoJoomCross Queue Processor"
+PLG_TASK_MOKOJOOMCROSS_DESCRIPTION="Joomla Scheduled Task for processing the MokoJoomCross cross-post queue. Handles queued posts, retries, scheduled posts, and log cleanup."
+
+PLG_TASK_MOKOJOOMCROSS_PROCESS_QUEUE_TITLE="MokoJoomCross - Process Queue"
+PLG_TASK_MOKOJOOMCROSS_PROCESS_QUEUE_DESC="Process queued cross-posts, retry failed posts, fire scheduled posts, and clean up old logs."
@@ -0,0 +1,2 @@
+PLG_TASK_MOKOJOOMCROSS="Task - MokoJoomCross Queue Processor"
+PLG_TASK_MOKOJOOMCROSS_DESCRIPTION="Joomla Scheduled Task for processing the MokoJoomCross cross-post queue."
@@ -0,0 +1 @@
+<\!DOCTYPE html><title></title>
@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * @package     MokoJoomCross
+ * @subpackage  plg_task_mokojoomcross
+ * @author      Moko Consulting <hello@mokoconsulting.tech>
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+defined('_JEXEC') or die;
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension type="plugin" group="task" method="upgrade">
+    <name>Task - MokoJoomCross Queue Processor</name>
+    <version>01.00.06-dev-dev</version>
+    <creationDate>2026-05-28</creationDate>
+    <author>Moko Consulting</author>
+    <authorEmail>hello@mokoconsulting.tech</authorEmail>
+    <authorUrl>https://mokoconsulting.tech</authorUrl>
+    <copyright>Copyright (C) 2026 Moko Consulting. All rights reserved.</copyright>
+    <license>GPL-3.0-or-later</license>
+    <description>PLG_TASK_MOKOJOOMCROSS_DESCRIPTION</description>
+
+    <namespace path="src">Joomla\Plugin\Task\MokoJoomCross</namespace>
+
+    <files>
+        <filename plugin="mokojoomcross">mokojoomcross.php</filename>
+        <folder>src</folder>
+        <folder>services</folder>
+        <folder>language</folder>
+    </files>
+
+    <languages>
+        <language tag="en-GB">language/en-GB/plg_task_mokojoomcross.ini</language>
+        <language tag="en-GB">language/en-GB/plg_task_mokojoomcross.sys.ini</language>
+    </languages>
+</extension>
@@ -0,0 +1 @@
+<\!DOCTYPE html><title></title>
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * @package     MokoJoomCross
+ * @subpackage  plg_task_mokojoomcross
+ * @author      Moko Consulting <hello@mokoconsulting.tech>
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\Task\MokoJoomCross\Extension\MokoJoomCrossTask;
+
+return new class () implements ServiceProviderInterface {
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $plugin = new MokoJoomCrossTask(
+                    $container->get(DispatcherInterface::class),
+                    (array) PluginHelper::getPlugin('task', 'mokojoomcross')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * @package     MokoJoomCross
+ * @subpackage  plg_task_mokojoomcross
+ * @author      Moko Consulting <hello@mokoconsulting.tech>
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+namespace Joomla\Plugin\Task\MokoJoomCross\Extension;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\Component\MokoJoomCross\Administrator\Helper\QueueProcessor;
+use Joomla\Component\Scheduler\Administrator\Event\ExecuteTaskEvent;
+use Joomla\Component\Scheduler\Administrator\Task\Status as TaskStatus;
+use Joomla\Component\Scheduler\Administrator\Traits\TaskPluginTrait;
+use Joomla\Event\SubscriberInterface;
+
+/**
+ * Joomla Scheduled Task plugin for MokoJoomCross queue processing.
+ *
+ * Registers with Joomla's Task Scheduler (System → Scheduled Tasks).
+ * Admin can create a task of type "MokoJoomCross - Process Queue"
+ * and configure the interval (recommended: every 5 minutes).
+ *
+ * This is the PREFERRED processing method. Page-load processing is
+ * a fallback for environments without cron/scheduler access.
+ */
+class MokoJoomCrossTask extends CMSPlugin implements SubscriberInterface
+{
+    use TaskPluginTrait;
+
+    /**
+     * @var string[]  The task type IDs this plugin provides
+     */
+    protected const TASKS_MAP = [
+        'mokojoomcross.process_queue' => [
+            'langConstPrefix' => 'PLG_TASK_MOKOJOOMCROSS_PROCESS_QUEUE',
+            'method'          => 'processQueue',
+            'form'            => '',
+        ],
+    ];
+
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            'onTaskOptionsList'    => 'advertiseRoutines',
+            'onExecuteTask'        => 'standardRoutineHandler',
+            'onContentPrepareForm' => 'enhanceTaskItemForm',
+        ];
+    }
+
+    /**
+     * Process the cross-post queue.
+     *
+     * @param   ExecuteTaskEvent  $event  The task event
+     *
+     * @return  int  Task status code
+     */
+    private function processQueue(ExecuteTaskEvent $event): int
+    {
+        $result = QueueProcessor::processQueue(20);
+
+        // Log summary
+        $this->logTask(sprintf(
+            'MokoJoomCross queue: %d processed, %d succeeded, %d failed, %d skipped',
+            $result['processed'],
+            $result['succeeded'],
+            $result['failed'],
+            $result['skipped']
+        ));
+
+        if ($result['skipped'] === -1) {
+            $this->logTask('Queue processing skipped — another process holds the lock');
+
+            return TaskStatus::KNOCKOUT;
+        }
+
+        return TaskStatus::OK;
+    }
+}
@@ -0,0 +1 @@
+<\!DOCTYPE html><title></title>
@@ -0,0 +1 @@
+<\!DOCTYPE html><title></title>
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="webservices" method="upgrade">
    <name>Web Services - MokoJoomCross</name>
-    <version>01.00.01-dev</version>
+    <version>01.00.06-dev-dev</version>
    <creationDate>2026-05-28</creationDate>
    <author>Moko Consulting</author>
    <authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -2,7 +2,7 @@
 <extension type="package" method="upgrade">
    <name>MokoJoomCross</name>
    <packagename>mokojoomcross</packagename>
-    <version>01.00.01-dev</version>
+    <version>01.00.06-dev-dev</version>
    <creationDate>2026-05-28</creationDate>
    <author>Moko Consulting</author>
    <authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -19,6 +19,7 @@
        <file type="plugin" id="mokojoomcross" group="system">plg_system_mokojoomcross.zip</file>
        <file type="plugin" id="mokojoomcross" group="content">plg_content_mokojoomcross.zip</file>
        <file type="plugin" id="mokojoomcross" group="webservices">plg_webservices_mokojoomcross.zip</file>
+        <file type="plugin" id="mokojoomcross" group="task">plg_task_mokojoomcross.zip</file>

        <!-- Service Plugins (mokojoomcross group) -->
        <file type="plugin" id="facebook" group="mokojoomcross">plg_mokojoomcross_facebook.zip</file>
@@ -63,6 +63,7 @@ class Pkg_MokoJoomCrossInstallerScript
                ['system', 'mokojoomcross'],
                ['content', 'mokojoomcross'],
                ['webservices', 'mokojoomcross'],
+                ['task', 'mokojoomcross'],
            ];

            foreach ($corePlugins as [$folder, $element]) {
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
 SPDX-License-Identifier: GPL-3.0-or-later
- VERSION: 01.00.00-dev
+ VERSION: 01.00.06-dev-dev-dev
 -->

 <updates>
  <update>
-    <name>MokoJoomCross</name>
-    <description>MokoJoomCross development build.</description>
+    <name>Package - MokoJoomCross</name>
+    <description>Package - MokoJoomCross development build.</description>
    <element>pkg_mokojoomcross</element>
    <type>package</type>
    <client>site</client>
-    <version>01.00.01-dev</version>
+    <version>01.00.06-dev-dev-dev</version>
    <creationDate>2026-05-28</creationDate>
-    <infourl title='MokoJoomCross'>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomCross/releases/tag/development</infourl>
+    <infourl title='Package - MokoJoomCross'>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomCross/releases/tag/development</infourl>
    <downloads>
-      <downloadurl type='full' format='zip'>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomCross/releases/download/development/pkg_mokojoomcross-01.00.01-dev-dev.zip</downloadurl>
+      <downloadurl type='full' format='zip'>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomCross/releases/download/development/pkg_mokojoomcross-01.00.06-dev-dev-dev.zip</downloadurl>
    </downloads>
-    <sha256>2d76321326d487419e133dae4abc5652d5f43c80c10650652078cffde6505e6f</sha256>
-    <tags><tag>development</tag></tags>
+    <sha256>87314ba561f5f1587d2ea3470a3426857bffc556ba3ea66deb7da6a6118930bd</sha256>
+    <tags><tag>dev</tag></tags>
    <maintainer>Moko Consulting</maintainer>
    <maintainerurl>https://mokoconsulting.tech</maintainerurl>
-    <targetplatform name='joomla' version='(5|6).*'/>
+    <targetplatform name="joomla" version="(5|6)\..*" />
  </update>
 </updates>
@@ -0,0 +1,77 @@
+# Message Templates
+
+MokoJoomCross uses message templates to format the content sent to each platform. Templates support placeholders that are replaced with article data at post time.
+
+## Managing Templates
+
+Navigate to **Components → MokoJoomCross → Templates** to create and edit templates.
+
+## Template Priority
+
+When cross-posting, the system looks for templates in this order:
+1. **Platform-specific template** — matches the service type exactly (e.g., "twitter")
+2. **Default template** — fallback used when no platform-specific template exists
+
+## Available Placeholders
+
+| Placeholder | Description | Example |
+|-------------|-------------|---------|
+| `{title}` | Article title | "New Product Launch" |
+| `{url}` | Full article URL | "https://example.com/article/123" |
+| `{introtext}` | Intro text (280 chars, HTML stripped) | "We're excited to announce..." |
+| `{fulltext}` | Full text (500 chars, HTML stripped) | Extended content |
+| `{image}` | Intro image full URL | "https://example.com/images/photo.jpg" |
+| `{category}` | Article category name | "News" |
+| `{author}` | Author display name | "John Smith" |
+| `{date}` | Publish date (YYYY-MM-DD) | "2026-05-28" |
+
+## Example Templates
+
+### Default (all platforms)
+```
+{title}
+
+{introtext}
+
+{url}
+```
+
+### Twitter / X (280 char limit)
+```
+{title}
+
+{url}
+```
+
+### Mastodon (with hashtags)
+```
+{title}
+
+{introtext}
+
+{url}
+
+#Joomla #{category}
+```
+
+### Mailchimp (HTML email)
+```html
+<h1>{title}</h1>
+<p>{introtext}</p>
+<p><a href="{url}">Read the full article</a></p>
+```
+
+### Telegram (HTML format)
+```html
+<b>{title}</b>
+
+{introtext}
+
+<a href="{url}">Read more</a>
+```
+
+## Per-Article Override
+
+In the article editor, the **Cross-Posting** tab lets you:
+- Skip cross-posting entirely for a specific article
+- Select which services to post to (instead of all enabled services)
@@ -0,0 +1,57 @@
+# REST API
+
+MokoJoomCross includes a WebServices plugin that provides REST API endpoints via Joomla's API application.
+
+## Authentication
+
+All endpoints require a Joomla API token. Generate one in **Users → Manage → [User] → API Tokens**.
+
+Include the token in the `Authorization` header:
+
+```
+Authorization: Bearer YOUR_API_TOKEN
+```
+
+## Base URL
+
+```
+https://yoursite.com/api/index.php/v1/mokojoomcross/
+```
+
+## Endpoints
+
+### Posts
+
+| Method | Endpoint | Description |
+|--------|----------|-------------|
+| GET | `/v1/mokojoomcross/posts` | List all cross-posts |
+| GET | `/v1/mokojoomcross/posts/:id` | Get single post details |
+| POST | `/v1/mokojoomcross/posts` | Create a cross-post entry |
+| DELETE | `/v1/mokojoomcross/posts/:id` | Delete a post |
+
+### Services
+
+| Method | Endpoint | Description |
+|--------|----------|-------------|
+| GET | `/v1/mokojoomcross/services` | List connected services |
+| GET | `/v1/mokojoomcross/services/:id` | Get service details |
+
+## Example
+
+```bash
+# List all posts
+curl -H "Authorization: Bearer YOUR_TOKEN" \
+  https://yoursite.com/api/index.php/v1/mokojoomcross/posts
+
+# List services
+curl -H "Authorization: Bearer YOUR_TOKEN" \
+  https://yoursite.com/api/index.php/v1/mokojoomcross/services
+```
+
+## Filtering
+
+Posts support query parameters:
+- `filter[status]=posted` — Filter by status (queued, posting, posted, failed, scheduled)
+- `filter[service_id]=5` — Filter by service
+- `page[limit]=20` — Pagination limit
+- `page[offset]=0` — Pagination offset
@@ -0,0 +1,60 @@
+# Services
+
+MokoJoomCross supports 9 platforms. Each is a separate plugin that can be enabled or disabled independently.
+
+## Social Media
+
+| Platform | Plugin | Character Limit | Media | Default Bot |
+|----------|--------|----------------|-------|-------------|
+| **Facebook** | plg_mokojoomcross_facebook | No limit | Yes | Yes |
+| **X / Twitter** | plg_mokojoomcross_twitter | 280 | Yes | No |
+| **LinkedIn** | plg_mokojoomcross_linkedin | 3,000 | Yes | No |
+| **Mastodon** | plg_mokojoomcross_mastodon | 500 | Yes | No |
+| **Bluesky** | plg_mokojoomcross_bluesky | 300 | Yes | No |
+
+## Email Marketing
+
+| Platform | Plugin | Character Limit | Media | Default Bot |
+|----------|--------|----------------|-------|-------------|
+| **Mailchimp** | plg_mokojoomcross_mailchimp | No limit | Yes | No |
+
+## Chat / Messaging
+
+| Platform | Plugin | Character Limit | Media | Default Bot |
+|----------|--------|----------------|-------|-------------|
+| **Telegram** | plg_mokojoomcross_telegram | 4,096 | Yes | Yes (@MokoWaaSBot) |
+| **Discord** | plg_mokojoomcross_discord | 2,000 | Yes | Yes (webhook) |
+| **Slack** | plg_mokojoomcross_slack | 40,000 | Yes | Yes (webhook) |
+
+## Default vs Custom Mode
+
+Services with "Default Bot" support offer two operating modes:
+
+- **Default Mode**: Uses a pre-configured bot/app token managed by Moko. The admin only needs to provide a destination (chat ID, page ID, etc.). The API key is stored in the plugin's configuration and never visible in the service record.
+
+- **Custom Mode**: The admin provides their own API keys, tokens, or webhook URLs. Full control, but requires setting up your own app/bot on the platform.
+
+Configure default tokens in **Extensions → Plugins → MokoJoomCross - [Platform]**.
+
+## Adding a Service
+
+1. Go to **Components → MokoJoomCross → Services**
+2. Click **New**
+3. Select the service type
+4. Enter a title and choose credentials mode
+5. For **Default mode**: enter only the destination (chat ID, channel, etc.)
+6. For **Custom mode**: enter your full API credentials as JSON
+7. Save and enable
+
+## Credentials Format
+
+Each service expects specific JSON fields. See the individual service pages:
+- [[Telegram]] — bot_token, chat_id
+- [[Facebook]] — page_access_token, page_id
+- [[Discord]] — webhook_url
+- [[Slack]] — webhook_url
+- [[LinkedIn]] — access_token, organization_id
+- [[Mastodon]] — instance_url, access_token
+- [[Bluesky]] — handle, app_password
+- [[Mailchimp]] — api_key, list_id
+- [[Twitter (X)]] — bearer_token, api_key, api_secret
@@ -0,0 +1,48 @@
+# Troubleshooting
+
+## Posts Stuck in "Queued" Status
+
+**Cause**: The queue processor isn't running.
+
+**Fix**:
+1. Check **Components → MokoJoomCross → Options → Queue Processing** — ensure it's set to "Scheduler" or "Both"
+2. If using Scheduler: verify a task exists in **System → Scheduled Tasks** of type "MokoJoomCross - Process Queue"
+3. If using Page-load: ensure the system plugin is enabled and check the throttle interval
+
+## Posts Failing
+
+**Cause**: Invalid credentials or platform API changes.
+
+**Fix**:
+1. Check the error message in **Components → MokoJoomCross → Post Queue** (hover over the red "Failed" badge)
+2. Check **Activity Logs** for detailed error messages
+3. Go to **Services** and verify credentials
+4. For services using Default mode, check the plugin params in **Extensions → Plugins**
+
+## "No service plugin found" Warning
+
+**Cause**: The service plugin for that platform is disabled.
+
+**Fix**: Go to **Extensions → Plugins**, search for "MokoJoomCross", and enable the relevant service plugin.
+
+## Cross-posting Not Triggering on Publish
+
+**Cause**: Auto-post is disabled or system plugin is inactive.
+
+**Fix**:
+1. Check **Components → MokoJoomCross → Options** — "Auto-post on Publish" should be "Yes"
+2. Verify **Extensions → Plugins → System - MokoJoomCross** is enabled
+3. Check that at least one service is configured and enabled
+
+## Duplicate Posts
+
+MokoJoomCross has a built-in duplicate guard. If you're seeing duplicates:
+1. Check if the article was saved multiple times in quick succession
+2. Check if both page-load and scheduler are running (shouldn't cause duplicates, but verify)
+3. Review the **Activity Logs** for the article in question
+
+## OAuth Connection Failing
+
+1. Verify the OAuth Client ID and Secret are correct in the plugin params
+2. Check that the redirect URI matches: `https://yoursite.com/administrator/index.php?option=com_mokojoomcross&task=oauth.callback`
+3. Ensure your Joomla site uses HTTPS (required by most OAuth providers)
Author	SHA1	Message	Date
gitea-actions[bot]	e31552259d	chore: update development channel 01.00.06-dev-dev [skip ci]	2026-05-28 18:42:22 +00:00
gitea-actions[bot]	97915d9f30	chore(version): auto-bump 01.00.06-dev-dev [skip ci]	2026-05-28 18:42:20 +00:00
Jonathan Miller	2872ae2b97	feat: low-priority issues #19-#22 Universal: Auto Version Bump / Version Bump (push) Successful in 4s Details Update Server / Update Server (push) Successful in 13s Details #19 Per-article cross-posting: Content plugin injects "Cross-Posting" fieldset into article editor via onContentPrepareForm. Dynamic checkbox list of all enabled services. Skip toggle. System plugin reads article attribs for mokojoomcross_services (array of service IDs) and mokojoomcross_skip (boolean). Unchecked = post to all. #20 Analytics dashboard: Posts-by-service breakdown table with success rate column (color-coded). Top cross-posted articles list. DashboardModel methods: getServiceBreakdown(), getDailyTrend(), getTopArticles(). #21 OAuth flows: OAuthHelper with authorize URL generation (Facebook, LinkedIn, Twitter), PKCE for Twitter, code→token exchange, token storage in service credentials. OauthController with authorize and callback actions. Reads client ID/secret from plugin params. #22 Wiki documentation: Services guide (all 9 platforms, default vs custom mode), REST API reference, Message Templates guide with examples per platform, Troubleshooting guide. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-05-28 13:42:07 -05:00
Moko Consulting	3664f547ee	feat(workflows): append stability suffix to manifest versions [skip bump] Universal: Auto Version Bump / Version Bump (push) Has been skipped Details	2026-05-28 13:41:34 -05:00
gitea-actions[bot]	6521edaab9	chore: update updates.xml (development: 01.00.05-dev-dev) [skip ci]	2026-05-28 18:36:31 +00:00
gitea-actions[bot]	3f6f286ffe	chore(version): auto-bump patch 01.00.05-dev [skip ci]	2026-05-28 18:36:29 +00:00
Jonathan Miller	342f6fa3b8	feat: medium-priority issues #12-#18 Universal: Auto Version Bump / Version Bump (push) Successful in 4s Details Update Server / Update updates.xml (push) Failing after 14s Details #12 LinkedIn: plugin config form (OAuth client ID/secret, redirect URI) #13 Mastodon: plugin config (default instance, visibility, hashtags) #14 Bluesky: plugin config (default PDS URL, auto link cards) #15 Mailchimp: plugin config (sender name/email, auto-send toggle) #17 Template management: full CRUD with TemplatesController, TemplateController, TemplatesModel, TemplateModel, TemplateTable. List view with service type badges and body preview. Edit view with placeholder reference panel showing all 8 placeholders. Filter form with search, published, service_type filters. Added Templates submenu item and dashboard quick link. #18 Logs: added filter form with level and search filters. #16 WebServices: implementation already in place from scaffold, routes registered for posts and services CRUD. Admin component now has 5 submenu items: Dashboard, Post Queue, Services, Templates, Activity Logs. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-05-28 13:36:11 -05:00
gitea-actions[bot]	2f60ede713	chore: update updates.xml (development: 01.00.04-dev-dev) [skip ci]	2026-05-28 18:29:39 +00:00
gitea-actions[bot]	8fba003d64	chore(version): auto-bump patch 01.00.04-dev [skip ci]	2026-05-28 18:29:37 +00:00
Jonathan Miller	76dfa177c4	feat: high-priority issues #6-#10 — migration + service plugins Universal: Auto Version Bump / Version Bump (push) Successful in 5s Details Update Server / Update updates.xml (push) Failing after 13s Details #6 PP Pro migration rewritten to read #__autotweet_channels table directly, mapping channeltype names to MokoJoomCross service types. Credential extraction per platform (Facebook page tokens, Twitter OAuth, Telegram bot tokens, Discord/Slack webhooks). Falls back to component params extraction when channel table doesn't exist. #7 Facebook plugin: config form with default_page_access_token and default_page_id. resolveToken() reads from plugin params. #8 Discord plugin: config form with default_webhook_url and embed_color. resolveWebhook() reads from plugin params. #9 Twitter plugin: implementation already complete from scaffold. #10 Slack plugin: config form with default_webhook_url. resolveWebhook() reads from plugin params. All service plugins with universal bot support now store default credentials in their own plugin params (Extensions → Plugins) rather than component params. This keeps sensitive tokens scoped to the plugin that uses them. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-05-28 13:29:22 -05:00
gitea-actions[bot]	4edc5a4765	chore: update updates.xml (development: 01.00.03-dev-dev) [skip ci]	2026-05-28 18:19:51 +00:00
gitea-actions[bot]	a67a2a3c5d	chore(version): auto-bump patch 01.00.03-dev [skip ci]	2026-05-28 18:19:49 +00:00
Jonathan Miller	9bbf2a74fb	feat: queue processor — scheduled task + page-load fallback (#11 ) Universal: Auto Version Bump / Version Bump (push) Successful in 5s Details Update Server / Update updates.xml (push) Failing after 14s Details Three-pronged queue processing: 1. Joomla Scheduled Task (preferred): New plg_task_mokojoomcross plugin registers "MokoJoomCross - Process Queue" task type. Admin creates a scheduled task in System → Scheduled Tasks with desired interval. 2. Page-load fallback: System plugin onAfterRender with configurable throttle interval. Runs on backend, frontend, or both. Small batch size (5) to avoid slowing page loads. 3. Both can run simultaneously — QueueProcessor uses DB-based lock to prevent concurrent execution (120s safety timeout). Shared QueueProcessor helper handles: - Queued post dispatch to service plugins - Failed post retry with configurable max retries + delay - Scheduled post firing (when scheduled_at <= now) - Log cleanup based on retention period Dashboard shows warning banner when page-load processing is active, recommending switch to Joomla Scheduled Tasks for production. Config options: queue_processing (scheduler/pageload/both), pageload_client (admin/site/both), pageload_interval (seconds). Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-05-28 13:19:31 -05:00
gitea-actions[bot]	04e7720268	chore: update updates.xml (development: 01.00.02-dev-dev) [skip ci]	2026-05-28 18:11:32 +00:00
gitea-actions[bot]	d4c2ff00c3	chore(version): auto-bump patch 01.00.02-dev [skip ci]	2026-05-28 18:11:31 +00:00
Jonathan Miller	559b9ca30c	feat: implement critical issues #1-#5 Universal: Auto Version Bump / Version Bump (push) Successful in 3s Details Update Server / Update updates.xml (push) Failing after 9s Details #1 Core engine: System plugin now dispatches to service plugins via onMokoJoomCrossGetServices event, executes publish() immediately, handles success/failure, duplicate guard prevents re-posting, listens to both onContentAfterSave and onContentChangeState events. Template rendering now resolves {category}, {author}, {date}, {fulltext}. #3 Services CRUD: Admin list template with service type icons, default/custom mode badges, publish toggle. Service edit form template. #4 Post Queue: Admin list template with status badges (color-coded), article title, service, message preview, platform post ID, error messages, retry count, timestamps. #5 Dashboard: Enhanced with recent activity feed from logs table, migration controller action for PP Pro import, quick links sidebar. #2 Telegram: Already implemented in scaffold, provider.php fixed. Also fixes: All 9 service plugin provider.php files had broken namespace references from bash heredoc escaping. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-05-28 13:11:20 -05:00