release: v01.08.00 -- AI captions, social images, calendar, analytics

Authored-by: Moko Consulting

.mokogitea/workflows/auto-bump.yml

@@ -1,66 +1,66 @@
-# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
-# INGROUP: mokocli.Release
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
-# PATH: /.mokogitea/workflows/auto-bump.yml
-# VERSION: 09.02.00
-# BRIEF: Auto patch-bump version on every push to dev (skips merge commits)
-
-name: "Universal: Auto Version Bump"
-
-on:
-  push:
-    branches:
-      - dev
-      - rc
-      - 'feature/**'
-      - 'patch/**'
-
-env:
-  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
-  GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
-
-permissions:
-  contents: write
-
-jobs:
-  bump:
-    name: Version Bump
-    runs-on: release
-    if: >-
-      !contains(github.event.head_commit.message, '[skip ci]') &&
-      !contains(github.event.head_commit.message, '[skip bump]') &&
-      !startsWith(github.event.head_commit.message, 'Merge pull request')
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          token: ${{ secrets.MOKOGITEA_TOKEN }}
-          fetch-depth: 1
-
-      - name: Setup mokocli tools
-        run: |
-          if ! command -v composer &> /dev/null; then
-            sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
-          fi
-          if [ -d "/opt/mokocli/cli" ]; then
-            echo "MOKO_CLI=/opt/mokocli/cli" >> "$GITHUB_ENV"
-          else
-            git clone --depth 1 --branch main --quiet \
-              "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/MokoConsulting/mokocli.git" \
-              /tmp/mokocli
-            cd /tmp/mokocli && composer install --no-dev --no-interaction --quiet
-            echo "MOKO_CLI=/tmp/mokocli/cli" >> "$GITHUB_ENV"
-          fi
-
-      - name: Bump version
-        run: |
-          php ${MOKO_CLI}/version_auto_bump.php \
-            --path . --branch "${GITHUB_REF_NAME}" \
-            --token "${{ secrets.MOKOGITEA_TOKEN }}" \
-            --repo-url "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
+# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# FILE INFORMATION
+# DEFGROUP: Gitea.Workflow
+# INGROUP: mokocli.Release
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
+# PATH: /.mokogitea/workflows/auto-bump.yml
+# VERSION: 09.02.00
+# BRIEF: Auto patch-bump version on every push to dev (skips merge commits)
+
+name: "Universal: Auto Version Bump"
+
+on:
+  push:
+    branches:
+      - dev
+      - rc
+      - 'feature/**'
+      - 'patch/**'
+
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+  MOKOGITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
+
+permissions:
+  contents: write
+
+jobs:
+  bump:
+    name: Version Bump
+    runs-on: release
+    if: >-
+      !contains(github.event.head_commit.message, '[skip ci]') &&
+      !contains(github.event.head_commit.message, '[skip bump]') &&
+      !startsWith(github.event.head_commit.message, 'Merge pull request')
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          token: ${{ secrets.MOKOGITEA_TOKEN }}
+          fetch-depth: 1
+
+      - name: Setup mokocli tools
+        run: |
+          if ! command -v composer &> /dev/null; then
+            sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
+          fi
+          if [ -d "/opt/mokocli/cli" ]; then
+            echo "MOKO_CLI=/opt/mokocli/cli" >> "$GITHUB_ENV"
+          else
+            git clone --depth 1 --branch main --quiet \
+              "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/MokoConsulting/mokocli.git" \
+              /tmp/mokocli
+            cd /tmp/mokocli && composer install --no-dev --no-interaction --quiet
+            echo "MOKO_CLI=/tmp/mokocli/cli" >> "$GITHUB_ENV"
+          fi
+
+      - name: Bump version
+        run: |
+          php ${MOKO_CLI}/version_auto_bump.php \
+            --path . --branch "${GITHUB_REF_NAME}" \
+            --token "${{ secrets.MOKOGITEA_TOKEN }}" \
+            --repo-url "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"

.mokogitea/workflows/auto-release.yml

@@ -27,7 +27,7 @@ name: "Universal: Build & Release"
 
 on:
   pull_request:
-    types: [opened, closed]
+    types: [opened, synchronize, closed]
     branches:
       - main
     paths-ignore:
@@ -52,7 +52,7 @@ on:
 
 env:
   FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
-  GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
+  MOKOGITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
   GITEA_ORG: ${{ vars.GITEA_ORG || github.repository_owner }}
   GITEA_REPO: ${{ vars.GITEA_REPO || github.event.repository.name }}
 
@@ -66,6 +66,7 @@ jobs:
     runs-on: release
     if: >-
       (github.event.action == 'opened' && github.event.pull_request.merged != true) ||
+      (github.event.action == 'synchronize' && github.event.pull_request.merged != true) ||
       (github.event_name == 'workflow_dispatch' && inputs.action == 'promote-rc')
 
     steps:
@@ -101,7 +102,7 @@ jobs:
           php ${MOKO_CLI}/branch_rename.php \
             --from "${{ github.event.pull_request.head.ref || 'dev' }}" --to rc \
             --token "${{ secrets.MOKOGITEA_TOKEN }}" \
-            --api-base "${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}" \
+            --api-base "${MOKOGITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}" \
             --pr "${{ github.event.pull_request.number }}"
 
       - name: Checkout rc and configure git
@@ -120,7 +121,7 @@ jobs:
 
       - name: Update RC release notes from CHANGELOG.md
         run: |
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          API_BASE="${MOKOGITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
           TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
 
           # Extract [Unreleased] section from changelog
@@ -268,7 +269,7 @@ jobs:
           !startsWith(steps.platform.outputs.platform, 'joomla')
         run: |
           VERSION="${{ steps.version.outputs.version }}"
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          API_BASE="${MOKOGITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
           TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
           SEMVER_TAG="v${VERSION}"
 
@@ -293,7 +294,7 @@ jobs:
 
       - name: Update release notes and promote changelog
         run: |
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          API_BASE="${MOKOGITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
           TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
 
           # Get the stable release info (version and ID)
@@ -362,7 +363,7 @@ jobs:
           VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}"
           RELEASE_TAG="${{ steps.version.outputs.release_tag }}"
           GH_REPO="${{ vars.GH_MIRROR_REPO || github.repository }}"
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          API_BASE="${MOKOGITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
           php ${MOKO_CLI}/release_mirror.php \
             --version "$VERSION" --tag "$RELEASE_TAG" \
             --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "$API_BASE" \
@@ -391,7 +392,7 @@ jobs:
         if: steps.version.outputs.skip != 'true'
         continue-on-error: true
         run: |
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          API_BASE="${MOKOGITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
           TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
 
           # Delete rc branch (ephemeral — created by promote-rc)
@@ -415,7 +416,7 @@ jobs:
         if: steps.version.outputs.skip != 'true'
         continue-on-error: true
         run: |
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          API_BASE="${MOKOGITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
           TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
           VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}"
           BRANCH_NAME="version/${VERSION}"
@@ -436,7 +437,7 @@ jobs:
         if: steps.version.outputs.skip != 'true'
         continue-on-error: true
         run: |
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          API_BASE="${MOKOGITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
           php ${MOKO_CLI}/version_reset_dev.php \
             --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "${API_BASE}" \
             --branch dev --path . 2>&1 || true
@@ -462,5 +463,5 @@ jobs:
             echo "| Version | \`${VERSION}\` |" >> $GITHUB_STEP_SUMMARY
             echo "| Branch | \`${{ steps.version.outputs.branch }}\` |" >> $GITHUB_STEP_SUMMARY
             echo "| Tag | \`${{ steps.version.outputs.tag }}\` |" >> $GITHUB_STEP_SUMMARY
-            echo "| Release | [View](${GITEA_URL}/${GITEA_ORG}/${GITEA_REPO}/releases/tag/${{ steps.version.outputs.tag }}) |" >> $GITHUB_STEP_SUMMARY
+            echo "| Release | [View](${MOKOGITEA_URL}/${GITEA_ORG}/${GITEA_REPO}/releases/tag/${{ steps.version.outputs.tag }}) |" >> $GITHUB_STEP_SUMMARY
           fi

.mokogitea/workflows/ci-generic.yml

@@ -13,6 +13,12 @@
 name: "Generic: Project CI"
 
 on:
+  pull_request:
+    branches:
+      - main
+      - dev
+      - dev/**
+      - rc/**
   workflow_dispatch:
 
 permissions:

.mokogitea/workflows/ci-issue-reporter.yml

@@ -50,8 +50,8 @@ jobs:
       - name: Clone MokoCLI
         env:
           MOKOGITEA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
-          MOKOGITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
         run: |
+          MOKOGITEA_URL="${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}"
           git clone --depth 1 --filter=blob:none --sparse "${MOKOGITEA_URL}/MokoConsulting/MokoCLI.git" /tmp/mokocli
           cd /tmp/mokocli && git sparse-checkout set cli/ci_issue_reporter.sh
 
@@ -59,14 +59,10 @@ jobs:
         env:
           MOKOGITEA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
           MOKOGITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
-          INPUT_GATE: ${{ inputs.gate }}
-          INPUT_DETAILS: ${{ inputs.details }}
-          INPUT_SEVERITY: ${{ inputs.severity }}
-          INPUT_WORKFLOW: ${{ inputs.workflow }}
         run: |
           chmod +x /tmp/mokocli/cli/ci_issue_reporter.sh
           /tmp/mokocli/cli/ci_issue_reporter.sh \
-            --gate "$INPUT_GATE" \
-            --details "$INPUT_DETAILS" \
-            --severity "$INPUT_SEVERITY" \
-            --workflow "$INPUT_WORKFLOW"
+            --gate "${{ inputs.gate }}" \
+            --details "${{ inputs.details }}" \
+            --severity "${{ inputs.severity }}" \
+            --workflow "${{ inputs.workflow }}"

.mokogitea/workflows/cleanup.yml

@@ -21,7 +21,7 @@ permissions:
   contents: write
 
 env:
-  GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
+  MOKOGITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
 
 jobs:
   cleanup:
@@ -33,17 +33,17 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          token: ${{ secrets.GA_TOKEN }}
+          token: ${{ secrets.MOKOGITEA_TOKEN }}
 
       - name: Delete merged branches
         env:
-          GA_TOKEN: ${{ secrets.GA_TOKEN }}
+          MOKOGITEA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
         run: |
           echo "=== Merged Branch Cleanup ==="
-          API="${GITEA_URL}/api/v1/repos/${{ github.repository }}"
+          API="${MOKOGITEA_URL}/api/v1/repos/${{ github.repository }}"
 
           # List branches via API
-          BRANCHES=$(curl -sS -H "Authorization: token ${GA_TOKEN}" \
+          BRANCHES=$(curl -sS -H "Authorization: token ${MOKOGITEA_TOKEN}" \
             "${API}/branches?limit=50" | jq -r '.[].name')
 
           DELETED=0
@@ -56,7 +56,7 @@ jobs:
             # Check if branch is merged into main
             if git merge-base --is-ancestor "origin/${BRANCH}" origin/main 2>/dev/null; then
               echo "  Deleting merged branch: ${BRANCH}"
-              curl -sS -X DELETE -H "Authorization: token ${GA_TOKEN}" \
+              curl -sS -X DELETE -H "Authorization: token ${MOKOGITEA_TOKEN}" \
                 "${API}/branches/${BRANCH}" 2>/dev/null || true
               DELETED=$((DELETED + 1))
             fi
@@ -66,20 +66,20 @@ jobs:
 
       - name: Clean old workflow runs
         env:
-          GA_TOKEN: ${{ secrets.GA_TOKEN }}
+          MOKOGITEA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
         run: |
           echo "=== Workflow Run Cleanup ==="
-          API="${GITEA_URL}/api/v1/repos/${{ github.repository }}"
+          API="${MOKOGITEA_URL}/api/v1/repos/${{ github.repository }}"
           CUTOFF=$(date -d "30 days ago" +%Y-%m-%dT%H:%M:%SZ 2>/dev/null || date -v-30d +%Y-%m-%dT%H:%M:%SZ)
 
           # Get old completed runs
-          RUNS=$(curl -sS -H "Authorization: token ${GA_TOKEN}" \
+          RUNS=$(curl -sS -H "Authorization: token ${MOKOGITEA_TOKEN}" \
             "${API}/actions/runs?status=completed&limit=50" | \
             jq -r ".workflow_runs[] | select(.created_at < \"${CUTOFF}\") | .id" 2>/dev/null)
 
           DELETED=0
           for RUN_ID in $RUNS; do
-            curl -sS -X DELETE -H "Authorization: token ${GA_TOKEN}" \
+            curl -sS -X DELETE -H "Authorization: token ${MOKOGITEA_TOKEN}" \
               "${API}/actions/runs/${RUN_ID}" 2>/dev/null || true
             DELETED=$((DELETED + 1))
           done

.mokogitea/workflows/deploy-manual.yml

@@ -0,0 +1,126 @@
+# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# FILE INFORMATION
+# DEFGROUP: Gitea.Workflow
+# INGROUP: MokoStandards.Deploy
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards-API
+# PATH: /templates/workflows/joomla/deploy-manual.yml.template
+# VERSION: 04.07.00
+# BRIEF: Manual SFTP deploy to dev server for Joomla repos
+
+name: "Universal: Deploy to Dev (Manual)"
+
+on:
+  workflow_dispatch:
+    inputs:
+      clear_remote:
+        description: 'Delete all remote files before uploading'
+        required: false
+        default: 'false'
+        type: boolean
+
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
+permissions:
+  contents: read
+
+jobs:
+  deploy:
+    name: SFTP Deploy to Dev
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+
+      - name: Setup PHP
+        run: |
+          php -v && composer --version
+
+      - name: Setup MokoStandards tools
+        env:
+          MOKOGITEA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN || github.token }}
+          MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN || github.token }}
+          MOKO_CLONE_HOST: ${{ secrets.MOKOGITEA_TOKEN && 'git.mokoconsulting.tech/MokoConsulting' || 'github.com/mokoconsulting-tech' }}
+          COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.MOKOGITEA_TOKEN || github.token }}"}}'
+        run: |
+          git clone --depth 1 --branch main --quiet \
+            "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/MokoStandards-API.git" \
+            /tmp/mokostandards-api 2>/dev/null || true
+          if [ -d "/tmp/mokostandards-api" ] && [ -f "/tmp/mokostandards-api/composer.json" ]; then
+            cd /tmp/mokostandards-api && composer install --no-dev --no-interaction --quiet 2>/dev/null || true
+          fi
+
+      - name: Check FTP configuration
+        id: check
+        env:
+          HOST: ${{ vars.DEV_FTP_HOST }}
+          PATH_VAR: ${{ vars.DEV_FTP_PATH }}
+          PORT: ${{ vars.DEV_FTP_PORT }}
+        run: |
+          if [ -z "$HOST" ] || [ -z "$PATH_VAR" ]; then
+            echo "DEV_FTP_HOST or DEV_FTP_PATH not configured -- cannot deploy"
+            echo "skip=true" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+          echo "skip=false" >> "$GITHUB_OUTPUT"
+          echo "host=$HOST" >> "$GITHUB_OUTPUT"
+
+          REMOTE="${PATH_VAR%/}"
+          echo "remote=$REMOTE" >> "$GITHUB_OUTPUT"
+
+          [ -z "$PORT" ] && PORT="22"
+          echo "port=$PORT" >> "$GITHUB_OUTPUT"
+
+      - name: Deploy via SFTP
+        if: steps.check.outputs.skip != 'true'
+        env:
+          SFTP_KEY: ${{ secrets.DEV_FTP_KEY }}
+          SFTP_PASS: ${{ secrets.DEV_FTP_PASSWORD }}
+          SFTP_USER: ${{ vars.DEV_FTP_USERNAME }}
+        run: |
+          SOURCE_DIR="src"
+          [ ! -d "$SOURCE_DIR" ] && SOURCE_DIR="htdocs"
+          [ ! -d "$SOURCE_DIR" ] && { echo "No src/ or htdocs/ -- nothing to deploy"; exit 0; }
+
+          printf '{"host":"%s","port":%s,"username":"%s","remotePath":"%s"' \
+            "${{ steps.check.outputs.host }}" "${{ steps.check.outputs.port }}" "$SFTP_USER" "${{ steps.check.outputs.remote }}" \
+            > /tmp/sftp-config.json
+
+          if [ -n "$SFTP_KEY" ]; then
+            echo "$SFTP_KEY" > /tmp/deploy_key
+            chmod 600 /tmp/deploy_key
+            printf ',"privateKeyPath":"/tmp/deploy_key"}' >> /tmp/sftp-config.json
+          else
+            printf ',"password":"%s"}' "$SFTP_PASS" >> /tmp/sftp-config.json
+          fi
+
+          DEPLOY_ARGS=(--path . --src-dir "$SOURCE_DIR" --config /tmp/sftp-config.json)
+          [ "${{ inputs.clear_remote }}" = "true" ] && DEPLOY_ARGS+=(--clear-remote)
+
+          PLATFORM=$(php /tmp/mokostandards-api/cli/platform_detect.php --path . 2>/dev/null || true)
+          if [ "$PLATFORM" = "waas-component" ] && [ -f "/tmp/mokostandards-api/deploy/deploy-joomla.php" ]; then
+            php /tmp/mokostandards-api/deploy/deploy-joomla.php "${DEPLOY_ARGS[@]}"
+          else
+            php /tmp/mokostandards-api/deploy/deploy-sftp.php "${DEPLOY_ARGS[@]}"
+          fi
+
+          rm -f /tmp/deploy_key /tmp/sftp-config.json
+
+      - name: Summary
+        if: always()
+        run: |
+          if [ "${{ steps.check.outputs.skip }}" = "true" ]; then
+            echo "### Deploy Skipped -- FTP not configured" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "### Manual Dev Deploy Complete" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY
+            echo "|-------|-------|" >> $GITHUB_STEP_SUMMARY
+            echo "| Host | \`${{ steps.check.outputs.host }}\` |" >> $GITHUB_STEP_SUMMARY
+            echo "| Remote | \`${{ steps.check.outputs.remote }}\` |" >> $GITHUB_STEP_SUMMARY
+            echo "| Clear | ${{ inputs.clear_remote }} |" >> $GITHUB_STEP_SUMMARY
+          fi

.mokogitea/workflows/issue-branch.yml

@@ -5,7 +5,7 @@
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
 # INGROUP: mokocli.Automation
-# VERSION: 01.08.54
+# VERSION: 01.08.61
 # BRIEF: Auto-create feature branch when an issue is opened
 
 name: "Universal: Issue Branch"
@@ -19,7 +19,7 @@ permissions:
   issues: write
 
 env:
-  GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
+  MOKOGITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
 
 jobs:
   create-branch:
@@ -28,8 +28,8 @@ jobs:
     steps:
       - name: Create branch and comment
         run: |
-          TOKEN="${{ secrets.GA_TOKEN }}"
-          API="${GITEA_URL}/api/v1/repos/${{ github.repository }}"
+          TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
+          API="${MOKOGITEA_URL}/api/v1/repos/${{ github.repository }}"
           ISSUE_NUM="${{ github.event.issue.number }}"
           ISSUE_TITLE="${{ github.event.issue.title }}"
 
@@ -58,7 +58,7 @@ jobs:
             echo "Created branch: ${BRANCH}"
 
             # Comment on issue with branch link
-            REPO_URL="${GITEA_URL}/${{ github.repository }}"
+            REPO_URL="${MOKOGITEA_URL}/${{ github.repository }}"
             BODY="Branch created: [\`${BRANCH}\`](${REPO_URL}/src/branch/${BRANCH})\n\n\`\`\`bash\ngit fetch origin\ngit checkout ${BRANCH}\n\`\`\`"
 
             curl -sf -X POST \

.mokogitea/workflows/pr-metadata-check.yml

@@ -20,7 +20,7 @@ permissions:
   contents: read
 
 env:
-  GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
+  MOKOGITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
   GITEA_ORG: ${{ vars.GITEA_ORG || github.repository_owner }}
   GITEA_REPO: ${{ vars.GITEA_REPO || github.event.repository.name }}
 
@@ -55,14 +55,14 @@ jobs:
 
       - name: Validate metadata against Joomla manifest
         env:
-          GITEA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
+          MOKOGITEA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
         run: |
           php ${MOKO_CLI}/joomla_metadata_validate.php \
             --path . \
-            --token "${GITEA_TOKEN}" \
+            --token "${MOKOGITEA_TOKEN}" \
             --org "${GITEA_ORG}" \
             --repo "${GITEA_REPO}" \
-            --api-base "${GITEA_URL}/api/v1" \
+            --api-base "${MOKOGITEA_URL}/api/v1" \
             --ci
 
           if [ $? -ne 0 ]; then

.mokogitea/workflows/pre-release.yml

@@ -7,7 +7,7 @@
 # INGROUP: mokocli.Release
 # REPO: https://git.mokoconsulting.tech/MokoConsulting/mokocli
 # PATH: /templates/workflows/universal/pre-release.yml.template
-# VERSION: 05.01.00
+# VERSION: 05.02.00
 # BRIEF: Auto pre-release on push to dev/alpha/beta/rc branches
 
 name: "Universal: Pre-Release"
@@ -59,6 +59,11 @@ jobs:
           fetch-depth: 0
           token: ${{ secrets.MOKOGITEA_TOKEN }}
           ref: ${{ github.ref_name }}
+          submodules: recursive
+
+      - name: Update submodules to main
+        run: |
+          git submodule foreach --quiet 'git checkout main && git pull --quiet origin main' 2>/dev/null || true
 
       - name: Setup mokocli tools
         env:

.mokogitea/workflows/rc-revert.yml

@@ -29,12 +29,20 @@ jobs:
 
     steps:
       - name: Rename branch
+        env:
+          BRANCH: ${{ github.event.pull_request.head.ref }}
+          REPO: ${{ github.repository }}
+          GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
+          TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
         run: |
-          BRANCH="${{ github.event.pull_request.head.ref }}"
+          set -euo pipefail
+          # BRANCH is attacker-controlled (PR head ref). Strict allowlist before ANY use.
+          if ! printf '%s' "$BRANCH" | grep -Eq '^rc/[A-Za-z0-9._/-]+$'; then
+            echo "::error::Refusing unsafe branch name: $BRANCH"; exit 1
+          fi
           SUFFIX="${BRANCH#rc/}"
           DEV_BRANCH="dev/${SUFFIX}"
-          API="${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}/api/v1/repos/${{ github.repository }}/branches"
-          TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
+          API="${GITEA_URL}/api/v1/repos/${REPO}/branches"
 
           # Create dev/ branch from rc/ branch
           STATUS=$(curl -sf -o /dev/null -w "%{http_code}" -X POST \
@@ -42,25 +50,22 @@ jobs:
             -H "Content-Type: application/json" \
             -d "{\"new_branch_name\": \"${DEV_BRANCH}\", \"old_branch_name\": \"${BRANCH}\"}" \
             "${API}" 2>/dev/null || true)
-
           if [ "$STATUS" = "201" ]; then
-            echo "Created branch: ${DEV_BRANCH}" >> $GITHUB_STEP_SUMMARY
+            echo "Created branch: ${DEV_BRANCH}" >> "$GITHUB_STEP_SUMMARY"
           else
-            echo "::error::Failed to create ${DEV_BRANCH} from ${BRANCH} (HTTP ${STATUS})"
-            exit 1
+            echo "::error::Failed to create ${DEV_BRANCH} from ${BRANCH} (HTTP ${STATUS})"; exit 1
           fi
 
-          # Delete rc/ branch
-          ENCODED=$(php -r "echo rawurlencode('${BRANCH}');")
+          # Read BRANCH from the environment inside PHP (getenv, no string interpolation -> no PHP injection)
+          ENCODED=$(php -r 'echo rawurlencode(getenv("BRANCH"));')
           STATUS=$(curl -sf -o /dev/null -w "%{http_code}" -X DELETE \
             -H "Authorization: token ${TOKEN}" \
             "${API}/${ENCODED}" 2>/dev/null || true)
-
           if [ "$STATUS" = "204" ]; then
-            echo "Deleted branch: ${BRANCH}" >> $GITHUB_STEP_SUMMARY
+            echo "Deleted branch: ${BRANCH}" >> "$GITHUB_STEP_SUMMARY"
           else
             echo "::warning::Failed to delete ${BRANCH} (HTTP ${STATUS})"
           fi
 
-          echo "### RC Reverted" >> $GITHUB_STEP_SUMMARY
-          echo "${BRANCH} → ${DEV_BRANCH}" >> $GITHUB_STEP_SUMMARY
+          echo "### RC Reverted" >> "$GITHUB_STEP_SUMMARY"
+          echo "${BRANCH} → ${DEV_BRANCH}" >> "$GITHUB_STEP_SUMMARY"

.mokogitea/workflows/version-set.yml

@@ -48,7 +48,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          token: ${{ secrets.MOKOGITEA_TOKEN || secrets.GA_TOKEN || github.token }}
+          token: ${{ secrets.MOKOGITEA_TOKEN || github.token }}
           ref: ${{ inputs.branch || github.ref }}
           fetch-depth: 1
 

.mokogitea/workflows/workflow-sync-trigger.yml

@@ -13,6 +13,7 @@
 name: "Universal: Workflow Sync Trigger"
 
 on:
+  workflow_dispatch:
   pull_request:
     types: [closed]
     branches:
@@ -26,8 +27,9 @@ jobs:
     name: Sync workflows to live repos
     runs-on: ubuntu-latest
     if: >-
-      github.event.pull_request.merged == true &&
-      !contains(github.event.pull_request.title, '[skip sync]')
+      github.event_name == 'workflow_dispatch' ||
+      (github.event.pull_request.merged == true &&
+      !contains(github.event.pull_request.title, '[skip sync]'))
 
     steps:
       - name: Determine platform from repo name
@@ -49,8 +51,14 @@ jobs:
         env:
           MOKOGITEA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
         run: |
-          GITEA_URL="${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}"
-          git clone --depth 1 "${GITEA_URL}/MokoConsulting/mokocli.git" /tmp/mokocli
+          MOKOGITEA_URL="${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}"
+          git clone --depth 1 "${MOKOGITEA_URL}/MokoConsulting/mokocli.git" /tmp/mokocli
+
+      - name: Install PHP
+        run: |
+          if ! command -v php &> /dev/null; then
+            apt-get update -qq && apt-get install -y -qq php-cli php-json php-curl > /dev/null 2>&1
+          fi
 
       - name: Install dependencies
         run: |

CHANGELOG.md

@@ -2,9 +2,12 @@
 ## [Unreleased]
 
 ### Added
-- **Best time to post analytics**: engagement tracking with heatmap dashboard widget (#165)
-- **Analytics heatmap**: 7x24 day/hour grid showing optimal posting windows per platform
-- **Analytics recommendations**: top posting times based on historical engagement data
+- **Visual post calendar**: Monthly calendar grid view showing scheduled, queued, and posted cross-posts with status badges (#160)
+- **Calendar navigation**: Month-by-month navigation with today highlighting (#160)
+- **Posting analytics**: Best time to post heatmap with day-of-week and hour-of-day breakdown (#165)
+- **Analytics service filter**: Filter heatmap and stats by service type with configurable date range
+- **Analytics service breakdown**: Per-service success rate, failure count, and average posts per day
+- **Analytics AJAX endpoint**: JSON heatmap data for dynamic filtering without page reload
 - **Social image generator**: Generate Open Graph images with article title overlay using PHP GD library (#157)
 - **Social image config**: Background color, text color, overlay style, and site name override in component options (#157)
 - **AI caption generation**: Generate platform-optimized cross-post captions from article content using Claude or OpenAI (#161)
@@ -33,8 +36,13 @@
 - **TikTok photo carousel**: Up to 35 image carousel posts via content/init endpoint (#164)
 - **TikTok posting mode**: Configurable DIRECT_POST or MEDIA_UPLOAD (sends to TikTok inbox for in-app editing) (#164)
 - **TikTok audit warning**: Language string explaining that unverified apps can only create private posts (#164)
+- **Link shortening**: Shorten URLs via Bitly, Rebrandly, or YOURLS with {url_short} placeholder (#159)
+- **Site frontend**: Public-facing cross-post list and detail views for site visitors (#133)
+- **Social preview**: AJAX platform mockups (Twitter, Facebook, LinkedIn, Instagram, Mastodon, Bluesky) in article editor (#156)
+- **PHPUnit test suite**: Unit tests for models, helpers, and service plugins (#132)
 
 ### Fixed
+- **PreviewController**: Add ACL check and parameterized query to prevent unauthorized article access (IDOR)
 - Webservices plugin Joomla 6 compatibility — `onBeforeApiRoute` receives `BeforeApiRouteEvent` object, extract router via `$event->getRouter()`
 
 ## [01.07.00] --- 2026-06-23
@@ -101,7 +109,7 @@
 ## [01.03.00] --- 2026-06-21
 
 
-<!-- VERSION: 01.08.54 -->
+<!-- VERSION: 01.08.61 -->
 
 All notable changes to MokoSuiteCross will be documented in this file.
 

CODE_OF_CONDUCT.md

@@ -14,7 +14,7 @@
 	DEFGROUP: Template-Joomla
 	INGROUP: Template-Joomla.Documentation
 	REPO: https://github.com/mokoconsulting-tech/Template-Joomla/
-  VERSION: 01.08.54
+  VERSION: 01.01.00
   PATH: ./CODE_OF_CONDUCT.md
   BRIEF: Community expectations and enforcement guidelines
   NOTE: Adapted with attribution from the Contributor Covenant v2.1

README.md

@@ -1,6 +1,6 @@
 # MokoSuiteCross
 
-<!-- VERSION: 01.08.54 -->
+<!-- VERSION: 01.08.61 -->
 
 Cross-posting Joomla content to social media, email marketing, and chat platforms for Joomla 5/6.
 
@@ -16,8 +16,14 @@ MokoSuiteCross automatically publishes your Joomla articles to multiple platform
 - **Post queue** — Scheduled posting, retry on failure, detailed delivery logs
 - **Message templates** — Customize post format per platform with placeholders ({title}, {url}, {social}, {short}, {chat}, {email_subject}, {email_body}, {field:xxx})
 - **Share Content panel** — Per-article fields for platform-optimized text (social, short, chat, email) with image picker
+- **AI caption generation** — Generate platform-optimized captions using Claude or OpenAI with one click
+- **Social preview** — AJAX platform mockups (Twitter, Facebook, LinkedIn, Instagram, Mastodon, Bluesky) in the article editor
+- **Social image generator** — Generate Open Graph images with article title overlay using PHP GD
+- **Link shortening** — Shorten URLs via Bitly, Rebrandly, or YOURLS with {url_short} placeholder
 - **Caption rotation** — {random:opt1|opt2|opt3} placeholder for varying evergreen re-shares
 - **UTM tracking** — Auto-append UTM parameters to shared links with {platform} token
+- **Post calendar** — Visual monthly calendar view of scheduled and completed cross-posts
+- **Posting analytics** — Best time to post heatmap with per-service breakdown and recommendations
 - **Delete from platforms** — Remove cross-posted content when articles are unpublished/trashed (7 platforms)
 - **Post history** — Track what was posted where, with platform response data
 - **Evergreen re-sharing** — Automatically re-share articles on a configurable interval
@@ -82,7 +88,7 @@ MokoSuiteCross automatically publishes your Joomla articles to multiple platform
 | RSS Feed | `plg_mokosuitecross_rssfeed` | Implemented |
 | ActivityPub | `plg_mokosuitecross_activitypub` | Implemented |
 | Google Business | `plg_mokosuitecross_googlebusiness` | Implemented |
-| Nostr | `plg_mokosuitecross_nostr` | Stub (WebSocket deferred) |
+| Nostr | `plg_mokosuitecross_nostr` | Implemented |
 
 ## Installation
 

SECURITY.md

@@ -23,7 +23,7 @@ DEFGROUP: Template-Joomla
 INGROUP: Template-Joomla.Documentation
 REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Joomla
 PATH: /SECURITY.md
-VERSION: 01.08.54
+VERSION: 01.01.00
 BRIEF: Security vulnerability reporting and handling policy
 -->
 
@@ -224,10 +224,10 @@ The following are explicitly out of scope:
 
 ## Metadata
 
-| Field        | Value                                                                                                        |
+| Field        | Value                                                                                                         |
 | ------------ | ------------------------------------------------------------------------------------------------------------ |
-| Document     | Security Policy                                                                                              |
-| Path         | /SECURITY.md                                                                                                 |
+| Document     | Security Policy                                                                                               |
+| Path         | /SECURITY.md                                                                                                  |
 | Repository   | [https://github.com/mokoconsulting-tech/Template-Joomla](https://github.com/mokoconsulting-tech/Template-Joomla) |
 | Owner        | Moko Consulting                                                                                              |
 | Scope        | Security vulnerability handling                                                                              |

source/packages/com_mokosuitecross/config.xml

@@ -267,37 +267,53 @@
     </fieldset>
 
     <fieldset name="social_image" label="COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE">
+        <field
+            name="social_image_enabled"
+            type="radio"
+            label="COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_ENABLED"
+            description="COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_ENABLED_DESC"
+            default="0"
+            class="btn-group">
+            <option value="1">JYES</option>
+            <option value="0">JNO</option>
+        </field>
         <field
             name="social_image_bg_color"
-            type="color"
+            type="text"
             label="COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_BG_COLOR"
             description="COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_BG_COLOR_DESC"
             default="#1a1a2e"
+            showon="social_image_enabled:1"
         />
         <field
             name="social_image_text_color"
-            type="color"
+            type="text"
             label="COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_TEXT_COLOR"
             description="COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_TEXT_COLOR_DESC"
             default="#ffffff"
+            showon="social_image_enabled:1"
         />
         <field
-            name="social_image_overlay"
-            type="list"
-            label="COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_OVERLAY"
-            description="COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_OVERLAY_DESC"
-            default="dark">
-            <option value="none">COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_OVERLAY_NONE</option>
-            <option value="light">COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_OVERLAY_LIGHT</option>
-            <option value="dark">COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_OVERLAY_DARK</option>
+            name="social_image_font_size"
+            type="number"
+            label="COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_FONT_SIZE"
+            description="COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_FONT_SIZE_DESC"
+            default="48"
+            min="24"
+            max="96"
+            showon="social_image_enabled:1"
+        />
+        <field
+            name="social_image_show_site_name"
+            type="radio"
+            label="COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_SHOW_SITE_NAME"
+            description="COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_SHOW_SITE_NAME_DESC"
+            default="1"
+            class="btn-group"
+            showon="social_image_enabled:1">
+            <option value="1">JYES</option>
+            <option value="0">JNO</option>
         </field>
-        <field
-            name="social_image_site_name"
-            type="text"
-            label="COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_SITE_NAME"
-            description="COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_SITE_NAME_DESC"
-            hint="Leave blank to use Joomla site name"
-        />
     </fieldset>
 
     <fieldset name="category_rules" label="COM_MOKOSUITECROSS_CONFIG_CATEGORY_RULES">

source/packages/com_mokosuitecross/language/en-GB/com_mokosuitecross.ini

@@ -570,31 +570,40 @@ COM_MOKOSUITECROSS_AI_GENERATE_DESC="Generate platform-optimized captions from t
 COM_MOKOSUITECROSS_AI_GENERATING="Generating captions..."
 COM_MOKOSUITECROSS_AI_GENERATED="AI captions generated successfully."
 COM_MOKOSUITECROSS_AI_ERROR="AI generation failed: %s"
-
-; Social Image Generator
-COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE="Social Image Generator"
-COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_BG_COLOR="Background Color"
-COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_BG_COLOR_DESC="Default background color for generated OG images when no article image is available."
-COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_TEXT_COLOR="Text Color"
-COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_TEXT_COLOR_DESC="Color for the title and site name text overlay on generated images."
-COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_OVERLAY="Image Overlay"
-COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_OVERLAY_DESC="Darken or lighten the background image to improve text readability."
-COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_OVERLAY_NONE="None"
-COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_OVERLAY_LIGHT="Light"
-COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_OVERLAY_DARK="Dark"
-COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_SITE_NAME="Site Name Override"
-COM_MOKOSUITECROSS_CONFIG_SOCIAL_IMAGE_SITE_NAME_DESC="Custom site name shown at the bottom of generated images. Leave blank to use the Joomla site name."
 COM_MOKOSUITECROSS_AI_NOT_CONFIGURED="AI is not configured. Go to Options to set up a provider and API key."
 
-
 ; Analytics
-COM_MOKOSUITECROSS_ANALYTICS="Analytics"
+COM_MOKOSUITECROSS_SUBMENU_ANALYTICS="Analytics"
+COM_MOKOSUITECROSS_ANALYTICS_PERIOD="Time Period"
+COM_MOKOSUITECROSS_ANALYTICS_SERVICE_FILTER="Service"
+COM_MOKOSUITECROSS_ANALYTICS_ALL_SERVICES="All Services"
 COM_MOKOSUITECROSS_ANALYTICS_BEST_TIMES="Best Times to Post"
 COM_MOKOSUITECROSS_ANALYTICS_HEATMAP="Engagement Heatmap"
-COM_MOKOSUITECROSS_ANALYTICS_NO_DATA="Not enough data yet. Analytics will appear after posts collect engagement metrics."
-COM_MOKOSUITECROSS_ANALYTICS_ENGAGEMENT_RATE="Engagement Rate"
-COM_MOKOSUITECROSS_ANALYTICS_ALL_PLATFORMS="All Platforms"
+COM_MOKOSUITECROSS_ANALYTICS_HOURLY="Hourly Distribution"
+COM_MOKOSUITECROSS_ANALYTICS_DAILY="Day of Week Distribution"
+COM_MOKOSUITECROSS_ANALYTICS_NO_DATA="Not enough posting data to generate recommendations. Post at least 3 times per time slot over the selected period."
+COM_MOKOSUITECROSS_ANALYTICS_POSTS_SUCCESS="%d of %d successful"
+COM_MOKOSUITECROSS_ANALYTICS_DAY_SUN="Sun"
+COM_MOKOSUITECROSS_ANALYTICS_DAY_MON="Mon"
+COM_MOKOSUITECROSS_ANALYTICS_DAY_TUE="Tue"
+COM_MOKOSUITECROSS_ANALYTICS_DAY_WED="Wed"
+COM_MOKOSUITECROSS_ANALYTICS_DAY_THU="Thu"
+COM_MOKOSUITECROSS_ANALYTICS_DAY_FRI="Fri"
+COM_MOKOSUITECROSS_ANALYTICS_DAY_SAT="Sat"
+COM_MOKOSUITECROSS_ANALYTICS_LEGEND_HIGH="High success rate"
+COM_MOKOSUITECROSS_ANALYTICS_LEGEND_MEDIUM="Medium success rate"
+COM_MOKOSUITECROSS_ANALYTICS_LEGEND_LOW="Low success rate"
+COM_MOKOSUITECROSS_ANALYTICS_LEGEND_NONE="No data"
+COM_MOKOSUITECROSS_PERIOD_180_DAYS="Last 180 days"
+COM_MOKOSUITECROSS_PERIOD_365_DAYS="Last 365 days"
+
 ; Category Rules
 COM_MOKOSUITECROSS_CONFIG_CATEGORY_RULES="Category Rules"
 COM_MOKOSUITECROSS_CONFIG_CATEGORY_RULES_NOTE="Category Routing"
 COM_MOKOSUITECROSS_CONFIG_CATEGORY_RULES_NOTE_DESC="Category routing rules let you map Joomla categories to specific cross-post services. When rules exist for a category, only those services receive posts. When no rules exist, all services are used (default behaviour). Rules are managed in the database table #__mokosuitecross_category_rules. A full admin UI will be added in a future release."
+
+; Calendar View
+COM_MOKOSUITECROSS_CALENDAR_PREV_MONTH="Previous"
+COM_MOKOSUITECROSS_CALENDAR_NEXT_MONTH="Next"
+COM_MOKOSUITECROSS_CALENDAR_TODAY="Today"
+COM_MOKOSUITECROSS_SUBMENU_CALENDAR="Post Calendar"

source/packages/com_mokosuitecross/mokosuitecross.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="component" method="upgrade">
     <name>com_mokosuitecross</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/com_mokosuitecross/sql/install.mysql.sql

@@ -96,27 +96,6 @@ INSERT INTO `#__mokosuitecross_templates` (`service_type`, `title`, `template_bo
 ('instagram', 'Instagram Default', '{social}\n\n{hashtags}', 1, 21, NOW()),
 ('youtube', 'YouTube Default', '{social}\n\n{url}', 1, 22, NOW());
 
-
-CREATE TABLE IF NOT EXISTS `#__mokosuitecross_analytics` (
-    `id` int unsigned NOT NULL AUTO_INCREMENT,
-    `post_id` int unsigned NOT NULL,
-    `service_id` int unsigned NOT NULL,
-    `service_type` varchar(50) NOT NULL DEFAULT '',
-    `posted_at` datetime DEFAULT NULL,
-    `day_of_week` tinyint unsigned NOT NULL DEFAULT 0,
-    `hour_of_day` tinyint unsigned NOT NULL DEFAULT 0,
-    `impressions` int unsigned NOT NULL DEFAULT 0,
-    `engagements` int unsigned NOT NULL DEFAULT 0,
-    `clicks` int unsigned NOT NULL DEFAULT 0,
-    `shares` int unsigned NOT NULL DEFAULT 0,
-    `engagement_rate` decimal(5,2) NOT NULL DEFAULT 0.00,
-    `created` datetime NOT NULL,
-    PRIMARY KEY (`id`),
-    KEY `idx_service_type` (`service_type`),
-    KEY `idx_day_hour` (`day_of_week`, `hour_of_day`),
-    KEY `idx_post` (`post_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
 CREATE TABLE IF NOT EXISTS `#__mokosuitecross_category_rules` (
     `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
     `category_id` int(10) unsigned NOT NULL,

source/packages/com_mokosuitecross/sql/updates/mysql/01.08.54.sql

@@ -1,23 +1 @@
--- MokoSuiteCross 01.08.54 -- Best time to post analytics
--- Copyright (C) 2026 Moko Consulting. All rights reserved.
--- SPDX-License-Identifier: GPL-3.0-or-later
-
-CREATE TABLE IF NOT EXISTS `#__mokosuitecross_analytics` (
-    `id` int unsigned NOT NULL AUTO_INCREMENT,
-    `post_id` int unsigned NOT NULL,
-    `service_id` int unsigned NOT NULL,
-    `service_type` varchar(50) NOT NULL DEFAULT '',
-    `posted_at` datetime DEFAULT NULL,
-    `day_of_week` tinyint unsigned NOT NULL DEFAULT 0,
-    `hour_of_day` tinyint unsigned NOT NULL DEFAULT 0,
-    `impressions` int unsigned NOT NULL DEFAULT 0,
-    `engagements` int unsigned NOT NULL DEFAULT 0,
-    `clicks` int unsigned NOT NULL DEFAULT 0,
-    `shares` int unsigned NOT NULL DEFAULT 0,
-    `engagement_rate` decimal(5,2) NOT NULL DEFAULT 0.00,
-    `created` datetime NOT NULL,
-    PRIMARY KEY (`id`),
-    KEY `idx_service_type` (`service_type`),
-    KEY `idx_day_hour` (`day_of_week`, `hour_of_day`),
-    KEY `idx_post` (`post_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/* 01.08.54 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.08.55.sql

@@ -0,0 +1 @@
+/* 01.08.55 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.08.56.sql

@@ -0,0 +1 @@
+/* 01.08.56 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.08.57.sql

@@ -0,0 +1 @@
+/* 01.08.57 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.08.58.sql

@@ -0,0 +1 @@
+/* 01.08.58 — no schema changes */

source/packages/com_mokosuitecross/sql/updates/mysql/01.08.61.sql

@@ -0,0 +1 @@
+/* 01.08.61 — no schema changes */

source/packages/com_mokosuitecross/src/Controller/AnalyticsController.php

@@ -14,84 +14,11 @@ namespace Joomla\Component\MokoSuiteCross\Administrator\Controller;
 defined('_JEXEC') or die;
 
 use Joomla\CMS\MVC\Controller\BaseController;
-use Joomla\CMS\Session\Session;
-use Joomla\Component\MokoSuiteCross\Administrator\Helper\AnalyticsHelper;
 
 class AnalyticsController extends BaseController
 {
-    /**
-     * Return heatmap grid data as JSON.
-     *
-     * Query params: service_type (string), days (int, default 90)
-     */
-    public function heatmap(): void
+    public function display($cachable = false, $urlparams = []): static
     {
-        if (!Session::checkToken('get')) {
-            echo json_encode(['success' => false, 'error' => 'Invalid token']);
-            $this->app->close();
-
-            return;
-        }
-
-        $user = $this->app->getIdentity();
-
-        if (!$user->authorise('core.manage', 'com_mokosuitecross')) {
-            echo json_encode(['success' => false, 'error' => 'Permission denied']);
-            $this->app->close();
-
-            return;
-        }
-
-        $serviceType = $this->input->getCmd('service_type', '');
-        $days        = $this->input->getInt('days', 90);
-
-        $grid      = AnalyticsHelper::getHeatmapData($serviceType, $days);
-        $bestTimes = AnalyticsHelper::getBestTimes($serviceType, 3);
-
-        $this->app->setHeader('Content-Type', 'application/json; charset=utf-8');
-        echo json_encode([
-            'success'    => true,
-            'grid'       => $grid,
-            'best_times' => $bestTimes,
-        ]);
-        $this->app->close();
-    }
-
-    /**
-     * Return the top posting times as JSON.
-     *
-     * Query params: service_type (string), limit (int, default 5)
-     */
-    public function besttimes(): void
-    {
-        if (!Session::checkToken('get')) {
-            echo json_encode(['success' => false, 'error' => 'Invalid token']);
-            $this->app->close();
-
-            return;
-        }
-
-        $user = $this->app->getIdentity();
-
-        if (!$user->authorise('core.manage', 'com_mokosuitecross')) {
-            echo json_encode(['success' => false, 'error' => 'Permission denied']);
-            $this->app->close();
-
-            return;
-        }
-
-        $serviceType = $this->input->getCmd('service_type', '');
-        $limit       = $this->input->getInt('limit', 5);
-
-        $bestTimes        = AnalyticsHelper::getBestTimes($serviceType, $limit);
-        $serviceBreakdown = AnalyticsHelper::getServiceBreakdown();
-
-        $this->app->setHeader('Content-Type', 'application/json; charset=utf-8');
-        echo json_encode([
-            'success'           => true,
-            'best_times'        => $bestTimes,
-            'service_breakdown' => $serviceBreakdown,
-        ]);
-        $this->app->close();
+        return parent::display($cachable, $urlparams);
     }
 }

source/packages/com_mokosuitecross/src/Controller/CalendarController.php

@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * @package     MokoSuiteCross
+ * @subpackage  com_mokosuitecross
+ * @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\MokoSuiteCross\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Controller\BaseController;
+
+class CalendarController extends BaseController
+{
+    public function display($cachable = false, $urlparams = []): static
+    {
+        return parent::display($cachable, $urlparams);
+    }
+}

source/packages/com_mokosuitecross/src/Controller/PreviewController.php

@@ -31,6 +31,17 @@ class PreviewController extends BaseController
             return;
         }
 
+        $user = $this->app->getIdentity();
+
+        if (!$user->authorise('core.manage', 'com_mokosuitecross')
+            && !$user->authorise('core.edit', 'com_content')
+            && !$user->authorise('core.edit.own', 'com_content')) {
+            echo json_encode(['error' => 'Permission denied']);
+            $this->app->close();
+
+            return;
+        }
+
         $articleId = $this->input->getInt('article_id', 0);
         $platform  = $this->input->getCmd('platform', 'twitter');
 
@@ -43,10 +54,14 @@ class PreviewController extends BaseController
 
         $db = Factory::getDbo();
 
+        $groups = $user->getAuthorisedViewLevels();
+
         $query = $db->getQuery(true)
             ->select('*')
             ->from($db->quoteName('#__content'))
-            ->where($db->quoteName('id') . ' = ' . $articleId);
+            ->where($db->quoteName('id') . ' = :id')
+            ->where($db->quoteName('access') . ' IN (' . implode(',', array_map('intval', $groups)) . ')')
+            ->bind(':id', $articleId, \Joomla\Database\ParameterType::INTEGER);
         $db->setQuery($query);
         $article = $db->loadObject();
 

source/packages/com_mokosuitecross/src/Helper/AnalyticsHelper.php

@@ -17,236 +17,144 @@ use Joomla\CMS\Factory;
 
 class AnalyticsHelper
 {
-    /**
-     * Record or update engagement metrics for a post.
-     *
-     * @param   int     $postId       The post ID
-     * @param   int     $serviceId    The service ID
-     * @param   string  $serviceType  The service type (e.g. twitter, facebook)
-     * @param   array   $metrics      Engagement metrics: impressions, engagements, clicks, shares, posted_at
-     *
-     * @return  bool  True on success
-     */
-    public static function recordEngagement(int $postId, int $serviceId, string $serviceType, array $metrics): bool
-    {
-        $db = Factory::getDbo();
+    private static array $dayNames = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
 
-        $postedAt = $metrics['posted_at'] ?? null;
-
-        if ($postedAt) {
-            $timestamp  = strtotime($postedAt);
-            $dayOfWeek  = (int) date('w', $timestamp);
-            $hourOfDay  = (int) date('G', $timestamp);
-        } else {
-            $dayOfWeek  = 0;
-            $hourOfDay  = 0;
-        }
-
-        $impressions = (int) ($metrics['impressions'] ?? 0);
-        $engagements = (int) ($metrics['engagements'] ?? 0);
-        $clicks      = (int) ($metrics['clicks'] ?? 0);
-        $shares      = (int) ($metrics['shares'] ?? 0);
-
-        $engagementRate = $impressions > 0
-            ? round(($engagements / $impressions) * 100, 2)
-            : 0.00;
-
-        // Check if a row already exists for this post
-        $query = $db->getQuery(true)
-            ->select($db->quoteName('id'))
-            ->from($db->quoteName('#__mokosuitecross_analytics'))
-            ->where($db->quoteName('post_id') . ' = ' . $postId)
-            ->where($db->quoteName('service_id') . ' = ' . $serviceId);
-        $db->setQuery($query);
-        $existingId = $db->loadResult();
-
-        if ($existingId) {
-            $query = $db->getQuery(true)
-                ->update($db->quoteName('#__mokosuitecross_analytics'))
-                ->set($db->quoteName('impressions') . ' = ' . $impressions)
-                ->set($db->quoteName('engagements') . ' = ' . $engagements)
-                ->set($db->quoteName('clicks') . ' = ' . $clicks)
-                ->set($db->quoteName('shares') . ' = ' . $shares)
-                ->set($db->quoteName('engagement_rate') . ' = ' . $engagementRate)
-                ->where($db->quoteName('id') . ' = ' . (int) $existingId);
-            $db->setQuery($query);
-            $db->execute();
-
-            return true;
-        }
-
-        $record = (object) [
-            'post_id'         => $postId,
-            'service_id'      => $serviceId,
-            'service_type'    => $serviceType,
-            'posted_at'       => $postedAt,
-            'day_of_week'     => $dayOfWeek,
-            'hour_of_day'     => $hourOfDay,
-            'impressions'     => $impressions,
-            'engagements'     => $engagements,
-            'clicks'          => $clicks,
-            'shares'          => $shares,
-            'engagement_rate' => $engagementRate,
-            'created'         => Factory::getDate()->toSql(),
-        ];
-
-        $db->insertObject('#__mokosuitecross_analytics', $record);
-
-        return true;
-    }
-
-    /**
-     * Get heatmap data as a 7x24 grid of average engagement rates.
-     *
-     * @param   string  $serviceType  Optional service type filter
-     * @param   int     $days         Number of days to look back (0 = all time)
-     *
-     * @return  array  7x24 grid: [ day_of_week => [ hour_of_day => avg_engagement_rate ] ]
-     */
-    public static function getHeatmapData(string $serviceType = '', int $days = 90): array
+    public static function getPostingHeatmap(string $serviceType = '', int $days = 90): array
     {
         $db = Factory::getDbo();
 
         $query = $db->getQuery(true)
-            ->select([
-                $db->quoteName('day_of_week'),
-                $db->quoteName('hour_of_day'),
-                'AVG(' . $db->quoteName('engagement_rate') . ') AS avg_rate',
-                'COUNT(*) AS post_count',
-            ])
-            ->from($db->quoteName('#__mokosuitecross_analytics'))
-            ->group($db->quoteName('day_of_week'))
-            ->group($db->quoteName('hour_of_day'))
-            ->order($db->quoteName('day_of_week') . ' ASC')
-            ->order($db->quoteName('hour_of_day') . ' ASC');
-
-        if ($serviceType !== '') {
-            $query->where($db->quoteName('service_type') . ' = ' . $db->quote($serviceType));
-        }
+            ->select('DAYOFWEEK(' . $db->quoteName('p.posted_at') . ') - 1 AS dow')
+            ->select('HOUR(' . $db->quoteName('p.posted_at') . ') AS hr')
+            ->select('COUNT(*) AS cnt')
+            ->from($db->quoteName('#__mokosuitecross_posts', 'p'))
+            ->where($db->quoteName('p.status') . ' = ' . $db->quote('posted'))
+            ->where($db->quoteName('p.posted_at') . ' IS NOT NULL');
 
         if ($days > 0) {
-            $cutoff = Factory::getDate('-' . $days . ' days')->toSql();
-            $query->where($db->quoteName('posted_at') . ' >= ' . $db->quote($cutoff));
+            $since = Factory::getDate('now - ' . $days . ' days')->toSql();
+            $query->where($db->quoteName('p.posted_at') . ' >= ' . $db->quote($since));
         }
 
+        if ($serviceType !== '') {
+            $query->join('INNER', $db->quoteName('#__mokosuitecross_services', 's') . ' ON ' . $db->quoteName('s.id') . ' = ' . $db->quoteName('p.service_id'))
+                ->where($db->quoteName('s.service_type') . ' = ' . $db->quote($serviceType));
+        }
+
+        $query->group('dow, hr')
+            ->order('dow ASC, hr ASC');
+
         $db->setQuery($query);
         $rows = $db->loadObjectList();
 
-        // Build 7x24 grid initialised to zero
         $grid = [];
 
         for ($d = 0; $d < 7; $d++) {
-            for ($h = 0; $h < 24; $h++) {
-                $grid[$d][$h] = ['avg_rate' => 0.00, 'post_count' => 0];
-            }
+            $grid[$d] = array_fill(0, 24, 0);
         }
 
         foreach ($rows as $row) {
-            $grid[(int) $row->day_of_week][(int) $row->hour_of_day] = [
-                'avg_rate'   => round((float) $row->avg_rate, 2),
-                'post_count' => (int) $row->post_count,
-            ];
+            $grid[(int) $row->dow][(int) $row->hr] = (int) $row->cnt;
         }
 
         return $grid;
     }
 
-    /**
-     * Get the best times to post ranked by average engagement rate.
-     *
-     * @param   string  $serviceType  Optional service type filter
-     * @param   int     $limit        Number of results to return
-     *
-     * @return  array  List of [day_of_week, hour_of_day, avg_rate, post_count]
-     */
-    public static function getBestTimes(string $serviceType = '', int $limit = 5): array
+    public static function getBestTimes(string $serviceType = '', int $days = 90, int $limit = 5): array
     {
-        $db = Factory::getDbo();
+        $grid  = self::getPostingHeatmap($serviceType, $days);
+        $slots = [];
 
-        $query = $db->getQuery(true)
-            ->select([
-                $db->quoteName('day_of_week'),
-                $db->quoteName('hour_of_day'),
-                'AVG(' . $db->quoteName('engagement_rate') . ') AS avg_rate',
-                'COUNT(*) AS post_count',
-            ])
-            ->from($db->quoteName('#__mokosuitecross_analytics'))
-            ->group($db->quoteName('day_of_week'))
-            ->group($db->quoteName('hour_of_day'))
-            ->having('COUNT(*) >= 1')
-            ->order('avg_rate DESC');
-
-        if ($serviceType !== '') {
-            $query->where($db->quoteName('service_type') . ' = ' . $db->quote($serviceType));
+        foreach ($grid as $dow => $hours) {
+            foreach ($hours as $hour => $count) {
+                if ($count > 0) {
+                    $slots[] = [
+                        'day'   => self::$dayNames[$dow],
+                        'hour'  => $hour,
+                        'count' => $count,
+                        'label' => self::$dayNames[$dow] . ' ' . self::formatHour($hour),
+                    ];
+                }
+            }
         }
 
-        $db->setQuery($query, 0, $limit);
-        $rows = $db->loadAssocList();
+        usort($slots, static fn($a, $b) => $b['count'] <=> $a['count']);
 
-        $dayNames = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
-
-        $results = [];
-
-        foreach ($rows as $row) {
-            $hour     = (int) $row['hour_of_day'];
-            $ampm     = $hour < 12 ? 'AM' : 'PM';
-            $hour12   = $hour % 12 ?: 12;
-
-            $results[] = [
-                'day_of_week' => (int) $row['day_of_week'],
-                'day_name'    => $dayNames[(int) $row['day_of_week']],
-                'hour_of_day' => $hour,
-                'hour_label'  => $hour12 . ':00 ' . $ampm,
-                'avg_rate'    => round((float) $row['avg_rate'], 2),
-                'post_count'  => (int) $row['post_count'],
-            ];
-        }
-
-        return $results;
+        return \array_slice($slots, 0, $limit);
     }
 
-    /**
-     * Get engagement stats grouped by service type.
-     *
-     * @param   int  $days  Number of days to look back (0 = all time)
-     *
-     * @return  array  List of [service_type, total_posts, avg_engagement_rate, total_impressions, total_engagements]
-     */
     public static function getServiceBreakdown(int $days = 30): array
     {
         $db = Factory::getDbo();
 
         $query = $db->getQuery(true)
-            ->select([
-                $db->quoteName('service_type'),
-                'COUNT(*) AS total_posts',
-                'AVG(' . $db->quoteName('engagement_rate') . ') AS avg_engagement_rate',
-                'SUM(' . $db->quoteName('impressions') . ') AS total_impressions',
-                'SUM(' . $db->quoteName('engagements') . ') AS total_engagements',
-                'SUM(' . $db->quoteName('clicks') . ') AS total_clicks',
-                'SUM(' . $db->quoteName('shares') . ') AS total_shares',
-            ])
-            ->from($db->quoteName('#__mokosuitecross_analytics'))
-            ->group($db->quoteName('service_type'))
-            ->order('avg_engagement_rate DESC');
+            ->select($db->quoteName('s.service_type'))
+            ->select($db->quoteName('s.title', 'service_title'))
+            ->select('COUNT(*) AS total')
+            ->select('SUM(CASE WHEN ' . $db->quoteName('p.status') . ' = ' . $db->quote('posted') . ' THEN 1 ELSE 0 END) AS success')
+            ->select('SUM(CASE WHEN ' . $db->quoteName('p.status') . ' = ' . $db->quote('failed') . ' THEN 1 ELSE 0 END) AS failed')
+            ->from($db->quoteName('#__mokosuitecross_posts', 'p'))
+            ->join('INNER', $db->quoteName('#__mokosuitecross_services', 's') . ' ON ' . $db->quoteName('s.id') . ' = ' . $db->quoteName('p.service_id'));
 
         if ($days > 0) {
-            $cutoff = Factory::getDate('-' . $days . ' days')->toSql();
-            $query->where($db->quoteName('posted_at') . ' >= ' . $db->quote($cutoff));
+            $since = Factory::getDate('now - ' . $days . ' days')->toSql();
+            $query->where($db->quoteName('p.created') . ' >= ' . $db->quote($since));
         }
 
+        $query->group($db->quoteName(['s.service_type', 's.title']))
+            ->order('total DESC');
+
         $db->setQuery($query);
-        $rows = $db->loadAssocList();
+        $rows = $db->loadObjectList();
 
-        foreach ($rows as &$row) {
-            $row['avg_engagement_rate'] = round((float) $row['avg_engagement_rate'], 2);
-            $row['total_posts']         = (int) $row['total_posts'];
-            $row['total_impressions']   = (int) $row['total_impressions'];
-            $row['total_engagements']   = (int) $row['total_engagements'];
-            $row['total_clicks']        = (int) $row['total_clicks'];
-            $row['total_shares']        = (int) $row['total_shares'];
+        $result = [];
+
+        foreach ($rows as $row) {
+            $total   = (int) $row->total;
+            $success = (int) $row->success;
+            $result[] = [
+                'service_type'  => $row->service_type,
+                'service_title' => $row->service_title,
+                'total'         => $total,
+                'success'       => $success,
+                'failed'        => (int) $row->failed,
+                'success_rate'  => $total > 0 ? round(($success / $total) * 100, 1) : 0.0,
+                'avg_per_day'   => $days > 0 ? round($total / $days, 1) : 0.0,
+            ];
         }
 
-        return $rows;
+        return $result;
     }
-}
+
+    public static function getServiceTypes(): array
+    {
+        $db = Factory::getDbo();
+
+        $query = $db->getQuery(true)
+            ->select('DISTINCT ' . $db->quoteName('service_type'))
+            ->from($db->quoteName('#__mokosuitecross_services'))
+            ->where($db->quoteName('published') . ' = 1')
+            ->order($db->quoteName('service_type') . ' ASC');
+
+        $db->setQuery($query);
+
+        return $db->loadColumn() ?: [];
+    }
+
+    private static function formatHour(int $hour): string
+    {
+        if ($hour === 0) {
+            return '12:00 AM';
+        }
+
+        if ($hour < 12) {
+            return $hour . ':00 AM';
+        }
+
+        if ($hour === 12) {
+            return '12:00 PM';
+        }
+
+        return ($hour - 12) . ':00 PM';
+    }
+}

source/packages/com_mokosuitecross/src/Helper/MokoSuiteCrossHelper.php

@@ -41,6 +41,8 @@ class MokoSuiteCrossHelper
             'services'  => 'COM_MOKOSUITECROSS_SUBMENU_SERVICES',
             'templates' => 'COM_MOKOSUITECROSS_SUBMENU_TEMPLATES',
             'logs'      => 'COM_MOKOSUITECROSS_SUBMENU_LOGS',
+            'calendar'  => 'COM_MOKOSUITECROSS_SUBMENU_CALENDAR',
+            'analytics' => 'COM_MOKOSUITECROSS_SUBMENU_ANALYTICS',
         ];
 
         // Joomla 5+ toolbar submenu

source/packages/com_mokosuitecross/src/Helper/SocialImageHelper.php

@@ -13,195 +13,169 @@ namespace Joomla\Component\MokoSuiteCross\Administrator\Helper;
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
-
 class SocialImageHelper
 {
-    private const WIDTH = 1200;
+    private const WIDTH  = 1200;
     private const HEIGHT = 630;
-    private const PADDING = 60;
-    private const MAX_TITLE_CHARS_PER_LINE = 30;
 
-    public static function generate(string $title, string $siteName, ?string $backgroundPath = null, array $options = []): string
+    /**
+     * Generate a branded social/OG image with text overlay.
+     *
+     * @param   string  $title     Article title to render on the image
+     * @param   string  $siteName  Site name for branding watermark
+     * @param   array   $config    Rendering config: bg_color, text_color, font_size, show_site_name
+     *
+     * @return  array  ['success' => bool, 'image_url' => string, 'error' => string]
+     */
+    public static function generate(string $title, string $siteName, array $config): array
     {
         if (!\function_exists('imagecreatetruecolor')) {
-            throw new \RuntimeException('PHP GD extension is required for social image generation.');
+            return ['success' => false, 'error' => 'PHP GD extension is not available'];
         }
 
-        $bgColor      = $options['bg_color'] ?? '#1a1a2e';
-        $textColor    = $options['text_color'] ?? '#ffffff';
-        $overlayType  = $options['overlay'] ?? 'dark';
-        $fontSize     = (int) ($options['font_size'] ?? 36);
+        $bgColor      = $config['bg_color'] ?? '#1a1a2e';
+        $textColor    = $config['text_color'] ?? '#ffffff';
+        $fontSize     = (int) ($config['font_size'] ?? 48);
+        $showSiteName = (bool) ($config['show_site_name'] ?? true);
+
+        $fontSize = max(24, min(96, $fontSize));
 
         $image = imagecreatetruecolor(self::WIDTH, self::HEIGHT);
 
         if ($image === false) {
-            throw new \RuntimeException('Failed to create image canvas.');
-        }
-
-        $bgRgb = self::hexToRgb($bgColor);
-        $bg = imagecolorallocate($image, $bgRgb[0], $bgRgb[1], $bgRgb[2]);
-        imagefill($image, 0, 0, $bg);
-
-        if ($backgroundPath !== null && is_file($backgroundPath)) {
-            self::drawBackground($image, $backgroundPath);
-        }
-
-        if ($overlayType !== 'none') {
-            self::drawOverlay($image, $overlayType);
+            return ['success' => false, 'error' => 'Failed to create image canvas'];
         }
 
+        $bgRgb   = self::hexToRgb($bgColor);
         $textRgb = self::hexToRgb($textColor);
-        $textCol = imagecolorallocate($image, $textRgb[0], $textRgb[1], $textRgb[2]);
 
-        $fontPath = self::findFont();
+        $bg   = imagecolorallocate($image, $bgRgb[0], $bgRgb[1], $bgRgb[2]);
+        $text = imagecolorallocate($image, $textRgb[0], $textRgb[1], $textRgb[2]);
 
-        if ($fontPath !== null) {
-            self::drawTextTtf($image, $title, $siteName, $fontPath, $fontSize, $textCol);
+        imagefilledrectangle($image, 0, 0, self::WIDTH - 1, self::HEIGHT - 1, $bg);
+
+        $fontFile = self::findFont();
+
+        if ($fontFile !== null) {
+            self::renderTtfText($image, $title, $text, $fontSize, $fontFile);
+
+            if ($showSiteName && $siteName !== '') {
+                $siteSize = (int) round($fontSize * 0.45);
+                $siteBox  = imagettfbbox($siteSize, 0, $fontFile, $siteName);
+                $siteX    = self::WIDTH - ($siteBox[2] - $siteBox[0]) - 40;
+                $siteY    = self::HEIGHT - 30;
+                imagettftext($image, $siteSize, 0, $siteX, $siteY, $text, $fontFile, $siteName);
+            }
         } else {
-            self::drawTextFallback($image, $title, $siteName, $textCol);
-        }
+            self::renderFallbackText($image, $title, $text);
 
-        $tmpDir  = Factory::getApplication()->get('tmp_path', JPATH_ROOT . '/tmp');
-        $outPath = $tmpDir . '/social_' . md5($title . $siteName . microtime()) . '.png';
-
-        imagepng($image, $outPath, 6);
-        imagedestroy($image);
-
-        return $outPath;
-    }
-
-    private static function drawBackground(\GdImage $image, string $path): void
-    {
-        $info = @getimagesize($path);
-
-        if ($info === false) {
-            return;
-        }
-
-        $source = match ($info[2]) {
-            IMAGETYPE_JPEG => @imagecreatefromjpeg($path),
-            IMAGETYPE_PNG  => @imagecreatefrompng($path),
-            IMAGETYPE_WEBP => \function_exists('imagecreatefromwebp') ? @imagecreatefromwebp($path) : false,
-            default        => false,
-        };
-
-        if ($source === false) {
-            return;
-        }
-
-        $srcW = imagesx($source);
-        $srcH = imagesy($source);
-
-        $scale = max(self::WIDTH / $srcW, self::HEIGHT / $srcH);
-        $newW  = (int) ($srcW * $scale);
-        $newH  = (int) ($srcH * $scale);
-        $dstX  = (int) ((self::WIDTH - $newW) / 2);
-        $dstY  = (int) ((self::HEIGHT - $newH) / 2);
-
-        imagecopyresampled($image, $source, $dstX, $dstY, 0, 0, $newW, $newH, $srcW, $srcH);
-        imagedestroy($source);
-    }
-
-    private static function drawOverlay(\GdImage $image, string $type): void
-    {
-        $opacity = ($type === 'light') ? 80 : 160;
-        $color   = imagecolorallocatealpha($image, 0, 0, 0, 127 - (int) ($opacity * 127 / 255));
-
-        if ($color === false) {
-            return;
-        }
-
-        imagesavealpha($image, true);
-        imagefilledrectangle($image, 0, 0, self::WIDTH - 1, self::HEIGHT - 1, $color);
-    }
-
-    private static function drawTextTtf(\GdImage $image, string $title, string $siteName, string $fontPath, int $fontSize, int $color): void
-    {
-        $lines    = self::wordWrap($title, $fontPath, $fontSize, self::WIDTH - self::PADDING * 2);
-        $lineH    = (int) ($fontSize * 1.4);
-        $totalH   = \count($lines) * $lineH;
-        $startY   = (int) ((self::HEIGHT - $totalH) / 2) + $fontSize;
-
-        foreach ($lines as $i => $line) {
-            $box = imagettfbbox($fontSize, 0, $fontPath, $line);
-            $lineW = abs($box[2] - $box[0]);
-            $x = (int) ((self::WIDTH - $lineW) / 2);
-            imagettftext($image, $fontSize, 0, $x, $startY + $i * $lineH, $color, $fontPath, $line);
-        }
-
-        $siteSize = (int) ($fontSize * 0.5);
-        $box = imagettfbbox($siteSize, 0, $fontPath, $siteName);
-        $siteW = abs($box[2] - $box[0]);
-        $siteX = (int) ((self::WIDTH - $siteW) / 2);
-        $siteY = self::HEIGHT - self::PADDING;
-
-        $siteCol = imagecolorallocatealpha($image, 255, 255, 255, 40);
-
-        if ($siteCol !== false) {
-            imagettftext($image, $siteSize, 0, $siteX, $siteY, $siteCol, $fontPath, $siteName);
-        }
-    }
-
-    private static function drawTextFallback(\GdImage $image, string $title, string $siteName, int $color): void
-    {
-        $maxChars = (int) (self::WIDTH / 10);
-        $wrapped  = wordwrap($title, $maxChars, "\n", true);
-        $lines    = explode("\n", $wrapped);
-        $lineH    = 20;
-        $totalH   = \count($lines) * $lineH;
-        $startY   = (int) ((self::HEIGHT - $totalH) / 2);
-
-        foreach ($lines as $i => $line) {
-            $lineW = \strlen($line) * 9;
-            $x = max(self::PADDING, (int) ((self::WIDTH - $lineW) / 2));
-            imagestring($image, 5, $x, $startY + $i * $lineH, $line, $color);
-        }
-
-        $siteW = \strlen($siteName) * 7;
-        $siteX = max(self::PADDING, (int) ((self::WIDTH - $siteW) / 2));
-        $siteY = self::HEIGHT - 40;
-
-        $gray = imagecolorallocate($image, 180, 180, 180);
-
-        if ($gray !== false) {
-            imagestring($image, 3, $siteX, $siteY, $siteName, $gray);
-        }
-    }
-
-    private static function wordWrap(string $text, string $fontPath, int $fontSize, int $maxWidth): array
-    {
-        $words  = explode(' ', $text);
-        $lines  = [];
-        $line   = '';
-
-        foreach ($words as $word) {
-            $test = ($line === '') ? $word : $line . ' ' . $word;
-            $box  = imagettfbbox($fontSize, 0, $fontPath, $test);
-            $testW = abs($box[2] - $box[0]);
-
-            if ($testW > $maxWidth && $line !== '') {
-                $lines[] = $line;
-                $line = $word;
-            } else {
-                $line = $test;
+            if ($showSiteName && $siteName !== '') {
+                $siteX = self::WIDTH - (\strlen($siteName) * imagefontwidth(3)) - 40;
+                $siteY = self::HEIGHT - 30;
+                imagestring($image, 3, $siteX, $siteY, $siteName, $text);
             }
         }
 
-        if ($line !== '') {
-            $lines[] = $line;
+        $outputDir = JPATH_ROOT . '/media/com_mokosuitecross/social';
+
+        if (!is_dir($outputDir)) {
+            mkdir($outputDir, 0755, true);
+        }
+
+        $hash     = hash('sha256', $title . $bgColor . $textColor . $fontSize);
+        $filename = $hash . '.png';
+        $filePath = $outputDir . '/' . $filename;
+
+        if (!imagepng($image, $filePath, 6)) {
+            imagedestroy($image);
+
+            return ['success' => false, 'error' => 'Failed to save image file'];
+        }
+
+        imagedestroy($image);
+
+        $imageUrl = 'media/com_mokosuitecross/social/' . $filename;
+
+        return ['success' => true, 'image_url' => $imageUrl];
+    }
+
+    private static function renderTtfText(\GdImage $image, string $title, int $color, int $fontSize, string $fontFile): void
+    {
+        $maxWidth = self::WIDTH - 120;
+        $lines    = self::wordWrapTtf($title, $fontFile, $fontSize, $maxWidth);
+        $lineHeight = (int) round($fontSize * 1.4);
+        $totalHeight = \count($lines) * $lineHeight;
+
+        $startY = (int) round((self::HEIGHT - $totalHeight) / 2) + $fontSize;
+
+        foreach ($lines as $i => $line) {
+            $y = $startY + ($i * $lineHeight);
+            imagettftext($image, $fontSize, 0, 60, $y, $color, $fontFile, $line);
+        }
+    }
+
+    private static function renderFallbackText(\GdImage $image, string $title, int $color): void
+    {
+        $font        = 5;
+        $charWidth   = imagefontwidth($font);
+        $charHeight  = imagefontheight($font);
+        $maxChars    = (int) floor((self::WIDTH - 120) / $charWidth);
+        $lines       = wordwrap($title, $maxChars, "\n", true);
+        $lineArray   = explode("\n", $lines);
+        $lineHeight  = $charHeight + 8;
+        $totalHeight = \count($lineArray) * $lineHeight;
+        $startY      = (int) round((self::HEIGHT - $totalHeight) / 2);
+
+        foreach ($lineArray as $i => $line) {
+            $y = $startY + ($i * $lineHeight);
+            imagestring($image, $font, 60, $y, $line, $color);
+        }
+    }
+
+    /**
+     * Word-wrap text for TTF rendering at a given pixel width.
+     *
+     * @return  string[]
+     */
+    private static function wordWrapTtf(string $text, string $fontFile, int $fontSize, int $maxWidth): array
+    {
+        $words = explode(' ', $text);
+        $lines = [];
+        $currentLine = '';
+
+        foreach ($words as $word) {
+            $testLine = $currentLine === '' ? $word : $currentLine . ' ' . $word;
+            $box      = imagettfbbox($fontSize, 0, $fontFile, $testLine);
+            $width    = abs($box[2] - $box[0]);
+
+            if ($width > $maxWidth && $currentLine !== '') {
+                $lines[]     = $currentLine;
+                $currentLine = $word;
+            } else {
+                $currentLine = $testLine;
+            }
+        }
+
+        if ($currentLine !== '') {
+            $lines[] = $currentLine;
         }
 
         return $lines ?: [$text];
     }
 
+    /**
+     * Locate a usable TTF font file -- check common system locations.
+     */
     private static function findFont(): ?string
     {
         $candidates = [
             JPATH_ROOT . '/media/com_mokosuitecross/fonts/OpenSans-Bold.ttf',
+            JPATH_ROOT . '/media/com_mokosuitecross/fonts/Roboto-Bold.ttf',
             '/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf',
             '/usr/share/fonts/truetype/liberation/LiberationSans-Bold.ttf',
-            'C:/Windows/Fonts/arialbd.ttf',
+            '/usr/share/fonts/TTF/DejaVuSans-Bold.ttf',
+            'C:/Windows/Fonts/arial.ttf',
+            'C:/Windows/Fonts/segoeui.ttf',
         ];
 
         foreach ($candidates as $path) {
@@ -213,6 +187,9 @@ class SocialImageHelper
         return null;
     }
 
+    /**
+     * @return  int[]  [r, g, b]
+     */
     private static function hexToRgb(string $hex): array
     {
         $hex = ltrim($hex, '#');

source/packages/com_mokosuitecross/src/Model/AnalyticsModel.php

@@ -0,0 +1,169 @@
+<?php
+
+/**
+ * @package     MokoSuiteCross
+ * @subpackage  com_mokosuitecross
+ * @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\MokoSuiteCross\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+
+class AnalyticsModel extends BaseDatabaseModel
+{
+    public function getHeatmap(int $days = 90, ?int $serviceId = null): array
+    {
+        $db = $this->getDatabase();
+
+        $cutoff = Factory::getDate('now - ' . $days . ' days')->format('Y-m-d H:i:s');
+
+        $query = $db->getQuery(true)
+            ->select([
+                'DAYOFWEEK(' . $db->quoteName('posted_at') . ') AS dow',
+                'HOUR(' . $db->quoteName('posted_at') . ') AS hour_of_day',
+                'COUNT(*) AS total',
+                'SUM(CASE WHEN ' . $db->quoteName('status') . ' = ' . $db->quote('posted') . ' THEN 1 ELSE 0 END) AS success',
+            ])
+            ->from($db->quoteName('#__mokosuitecross_posts'))
+            ->where($db->quoteName('posted_at') . ' IS NOT NULL')
+            ->where($db->quoteName('posted_at') . ' >= ' . $db->quote($cutoff))
+            ->group('DAYOFWEEK(' . $db->quoteName('posted_at') . '), HOUR(' . $db->quoteName('posted_at') . ')')
+            ->order('dow ASC, hour_of_day ASC');
+
+        if ($serviceId !== null && $serviceId > 0) {
+            $query->where($db->quoteName('service_id') . ' = ' . (int) $serviceId);
+        }
+
+        $db->setQuery($query);
+        $rows = $db->loadAssocList() ?: [];
+
+        $grid = [];
+
+        for ($d = 1; $d <= 7; $d++) {
+            for ($h = 0; $h < 24; $h++) {
+                $grid[$d][$h] = ['total' => 0, 'success' => 0, 'rate' => 0];
+            }
+        }
+
+        foreach ($rows as $row) {
+            $d = (int) $row['dow'];
+            $h = (int) $row['hour_of_day'];
+            $grid[$d][$h] = [
+                'total'   => (int) $row['total'],
+                'success' => (int) $row['success'],
+                'rate'    => (int) $row['total'] > 0
+                    ? round(((int) $row['success'] / (int) $row['total']) * 100)
+                    : 0,
+            ];
+        }
+
+        return $grid;
+    }
+
+    public function getBestTimes(int $days = 90, ?int $serviceId = null, int $limit = 5): array
+    {
+        $db = $this->getDatabase();
+
+        $cutoff = Factory::getDate('now - ' . $days . ' days')->format('Y-m-d H:i:s');
+
+        $query = $db->getQuery(true)
+            ->select([
+                'DAYOFWEEK(' . $db->quoteName('posted_at') . ') AS dow',
+                'HOUR(' . $db->quoteName('posted_at') . ') AS hour_of_day',
+                'COUNT(*) AS total',
+                'SUM(CASE WHEN ' . $db->quoteName('status') . ' = ' . $db->quote('posted') . ' THEN 1 ELSE 0 END) AS success',
+            ])
+            ->from($db->quoteName('#__mokosuitecross_posts'))
+            ->where($db->quoteName('posted_at') . ' IS NOT NULL')
+            ->where($db->quoteName('posted_at') . ' >= ' . $db->quote($cutoff))
+            ->group('DAYOFWEEK(' . $db->quoteName('posted_at') . '), HOUR(' . $db->quoteName('posted_at') . ')')
+            ->having('COUNT(*) >= 3')
+            ->order('success DESC, total DESC');
+
+        if ($serviceId !== null && $serviceId > 0) {
+            $query->where($db->quoteName('service_id') . ' = ' . (int) $serviceId);
+        }
+
+        $db->setQuery($query, 0, $limit);
+
+        return $db->loadAssocList() ?: [];
+    }
+
+    public function getHourlyDistribution(int $days = 90, ?int $serviceId = null): array
+    {
+        $db = $this->getDatabase();
+
+        $cutoff = Factory::getDate('now - ' . $days . ' days')->format('Y-m-d H:i:s');
+
+        $query = $db->getQuery(true)
+            ->select([
+                'HOUR(' . $db->quoteName('posted_at') . ') AS hour_of_day',
+                'COUNT(*) AS total',
+                'SUM(CASE WHEN ' . $db->quoteName('status') . ' = ' . $db->quote('posted') . ' THEN 1 ELSE 0 END) AS success',
+                'SUM(CASE WHEN ' . $db->quoteName('status') . ' = ' . $db->quote('failed') . ' THEN 1 ELSE 0 END) AS failed',
+            ])
+            ->from($db->quoteName('#__mokosuitecross_posts'))
+            ->where($db->quoteName('posted_at') . ' IS NOT NULL')
+            ->where($db->quoteName('posted_at') . ' >= ' . $db->quote($cutoff))
+            ->group('HOUR(' . $db->quoteName('posted_at') . ')')
+            ->order('hour_of_day ASC');
+
+        if ($serviceId !== null && $serviceId > 0) {
+            $query->where($db->quoteName('service_id') . ' = ' . (int) $serviceId);
+        }
+
+        $db->setQuery($query);
+
+        return $db->loadAssocList() ?: [];
+    }
+
+    public function getDayOfWeekDistribution(int $days = 90, ?int $serviceId = null): array
+    {
+        $db = $this->getDatabase();
+
+        $cutoff = Factory::getDate('now - ' . $days . ' days')->format('Y-m-d H:i:s');
+
+        $query = $db->getQuery(true)
+            ->select([
+                'DAYOFWEEK(' . $db->quoteName('posted_at') . ') AS dow',
+                'COUNT(*) AS total',
+                'SUM(CASE WHEN ' . $db->quoteName('status') . ' = ' . $db->quote('posted') . ' THEN 1 ELSE 0 END) AS success',
+                'SUM(CASE WHEN ' . $db->quoteName('status') . ' = ' . $db->quote('failed') . ' THEN 1 ELSE 0 END) AS failed',
+            ])
+            ->from($db->quoteName('#__mokosuitecross_posts'))
+            ->where($db->quoteName('posted_at') . ' IS NOT NULL')
+            ->where($db->quoteName('posted_at') . ' >= ' . $db->quote($cutoff))
+            ->group('DAYOFWEEK(' . $db->quoteName('posted_at') . ')')
+            ->order('dow ASC');
+
+        if ($serviceId !== null && $serviceId > 0) {
+            $query->where($db->quoteName('service_id') . ' = ' . (int) $serviceId);
+        }
+
+        $db->setQuery($query);
+
+        return $db->loadAssocList() ?: [];
+    }
+
+    public function getServices(): array
+    {
+        $db = $this->getDatabase();
+
+        $query = $db->getQuery(true)
+            ->select([$db->quoteName('id'), $db->quoteName('title'), $db->quoteName('service_type')])
+            ->from($db->quoteName('#__mokosuitecross_services'))
+            ->where($db->quoteName('published') . ' = 1')
+            ->order($db->quoteName('title') . ' ASC');
+
+        $db->setQuery($query);
+
+        return $db->loadAssocList() ?: [];
+    }
+}

source/packages/com_mokosuitecross/src/Model/CalendarModel.php

@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * @package     MokoSuiteCross
+ * @subpackage  com_mokosuitecross
+ * @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\MokoSuiteCross\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+
+class CalendarModel extends BaseDatabaseModel
+{
+    /**
+     * Get cross-post events for a given month, grouped by date.
+     *
+     * @param   int  $year   Four-digit year
+     * @param   int  $month  Month number (1-12)
+     *
+     * @return  array  Associative array keyed by Y-m-d, each value an array of event objects
+     */
+    public function getEvents(int $year, int $month): array
+    {
+        $db = $this->getDatabase();
+
+        $firstDay = sprintf('%04d-%02d-01', $year, $month);
+        $lastDay  = date('Y-m-t', strtotime($firstDay));
+
+        $dateExpr = 'COALESCE('
+            . $db->quoteName('p.scheduled_at') . ', '
+            . $db->quoteName('p.posted_at') . ', '
+            . $db->quoteName('p.created') . ')';
+
+        $query = $db->getQuery(true)
+            ->select([
+                'DATE(' . $dateExpr . ') AS event_date',
+                $db->quoteName('p.status'),
+                $db->quoteName('s.service_type'),
+                $db->quoteName('c.title', 'article_title'),
+            ])
+            ->from($db->quoteName('#__mokosuitecross_posts', 'p'))
+            ->join('LEFT', $db->quoteName('#__mokosuitecross_services', 's')
+                . ' ON ' . $db->quoteName('s.id') . ' = ' . $db->quoteName('p.service_id'))
+            ->join('LEFT', $db->quoteName('#__content', 'c')
+                . ' ON ' . $db->quoteName('c.id') . ' = ' . $db->quoteName('p.article_id'))
+            ->where('DATE(' . $dateExpr . ') >= ' . $db->quote($firstDay))
+            ->where('DATE(' . $dateExpr . ') <= ' . $db->quote($lastDay))
+            ->order('DATE(' . $dateExpr . ') ASC, ' . $db->quoteName('p.created') . ' ASC');
+
+        $db->setQuery($query);
+        $rows = $db->loadObjectList() ?: [];
+
+        $grouped = [];
+
+        foreach ($rows as $row) {
+            $grouped[$row->event_date][] = $row;
+        }
+
+        return $grouped;
+    }
+}

source/packages/com_mokosuitecross/src/View/Analytics/HtmlView.php

@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * @package     MokoSuiteCross
+ * @subpackage  com_mokosuitecross
+ * @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\MokoSuiteCross\Administrator\View\Analytics;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+use Joomla\Component\MokoSuiteCross\Administrator\Helper\MokoSuiteCrossHelper;
+
+class HtmlView extends BaseHtmlView
+{
+    public $heatmap;
+    public $bestTimes;
+    public $hourlyDistribution;
+    public $dayDistribution;
+    public $services;
+    public $serviceId;
+    public $period;
+
+    public function display($tpl = null): void
+    {
+        /** @var \Joomla\Component\MokoSuiteCross\Administrator\Model\AnalyticsModel $model */
+        $model = $this->getModel();
+
+        $input = Factory::getApplication()->input;
+        $this->period    = $input->getInt('period', 90);
+        $this->serviceId = $input->getInt('service_id', 0);
+
+        $validPeriods = [7, 30, 90, 180, 365];
+
+        if (!\in_array($this->period, $validPeriods, true)) {
+            $this->period = 90;
+        }
+
+        $sid = $this->serviceId > 0 ? $this->serviceId : null;
+
+        $this->heatmap            = $model->getHeatmap($this->period, $sid);
+        $this->bestTimes          = $model->getBestTimes($this->period, $sid);
+        $this->hourlyDistribution = $model->getHourlyDistribution($this->period, $sid);
+        $this->dayDistribution    = $model->getDayOfWeekDistribution($this->period, $sid);
+        $this->services           = $model->getServices();
+
+        $this->addToolbar();
+
+        MokoSuiteCrossHelper::addSubmenu('analytics');
+
+        parent::display($tpl);
+    }
+
+    protected function addToolbar(): void
+    {
+        ToolbarHelper::title('MokoSuiteCross -- Analytics', 'chart');
+    }
+}

source/packages/com_mokosuitecross/src/View/Calendar/HtmlView.php

@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * @package     MokoSuiteCross
+ * @subpackage  com_mokosuitecross
+ * @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\MokoSuiteCross\Administrator\View\Calendar;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+use Joomla\Component\MokoSuiteCross\Administrator\Helper\MokoSuiteCrossHelper;
+
+class HtmlView extends BaseHtmlView
+{
+    public int $year;
+    public int $month;
+    public array $events;
+    public $sidebar;
+
+    public function display($tpl = null): void
+    {
+        $input = Factory::getApplication()->input;
+
+        $this->year  = $input->getInt('year', (int) date('Y'));
+        $this->month = $input->getInt('month', (int) date('n'));
+
+        if ($this->month < 1 || $this->month > 12) {
+            $this->month = (int) date('n');
+        }
+
+        if ($this->year < 2000 || $this->year > 2100) {
+            $this->year = (int) date('Y');
+        }
+
+        $model        = $this->getModel();
+        $this->events = $model->getEvents($this->year, $this->month);
+
+        $this->addToolbar();
+
+        MokoSuiteCrossHelper::addSubmenu('calendar');
+        $this->sidebar = \Joomla\CMS\HTML\Sidebar::render();
+
+        parent::display($tpl);
+    }
+
+    protected function addToolbar(): void
+    {
+        $canDo = MokoSuiteCrossHelper::getActions();
+
+        ToolbarHelper::title('MokoSuiteCross -- Post Calendar', 'calendar');
+        ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokosuitecross&view=dashboard');
+
+        if ($canDo->get('core.admin')) {
+            ToolbarHelper::preferences('com_mokosuitecross');
+        }
+    }
+}

source/packages/com_mokosuitecross/tmpl/analytics/default.php

@@ -0,0 +1,240 @@
+<?php
+
+/**
+ * @package     MokoSuiteCross
+ * @subpackage  com_mokosuitecross
+ * @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\Language\Text;
+
+/** @var \Joomla\Component\MokoSuiteCross\Administrator\View\Analytics\HtmlView $this */
+
+$dayNames = [
+    1 => Text::_('COM_MOKOSUITECROSS_ANALYTICS_DAY_SUN'),
+    2 => Text::_('COM_MOKOSUITECROSS_ANALYTICS_DAY_MON'),
+    3 => Text::_('COM_MOKOSUITECROSS_ANALYTICS_DAY_TUE'),
+    4 => Text::_('COM_MOKOSUITECROSS_ANALYTICS_DAY_WED'),
+    5 => Text::_('COM_MOKOSUITECROSS_ANALYTICS_DAY_THU'),
+    6 => Text::_('COM_MOKOSUITECROSS_ANALYTICS_DAY_FRI'),
+    7 => Text::_('COM_MOKOSUITECROSS_ANALYTICS_DAY_SAT'),
+];
+?>
+<form method="get" class="mb-3">
+    <input type="hidden" name="option" value="com_mokosuitecross" />
+    <input type="hidden" name="view" value="analytics" />
+    <div class="row g-2 align-items-end">
+        <div class="col-auto">
+            <label class="form-label" for="analytics-period"><?php echo Text::_('COM_MOKOSUITECROSS_ANALYTICS_PERIOD'); ?></label>
+            <select name="period" id="analytics-period" class="form-select" onchange="this.form.submit();">
+                <option value="7" <?php echo $this->period == 7 ? 'selected' : ''; ?>><?php echo Text::_('COM_MOKOSUITECROSS_PERIOD_7_DAYS'); ?></option>
+                <option value="30" <?php echo $this->period == 30 ? 'selected' : ''; ?>><?php echo Text::_('COM_MOKOSUITECROSS_PERIOD_30_DAYS'); ?></option>
+                <option value="90" <?php echo $this->period == 90 ? 'selected' : ''; ?>><?php echo Text::_('COM_MOKOSUITECROSS_PERIOD_90_DAYS'); ?></option>
+                <option value="180" <?php echo $this->period == 180 ? 'selected' : ''; ?>><?php echo Text::_('COM_MOKOSUITECROSS_PERIOD_180_DAYS'); ?></option>
+                <option value="365" <?php echo $this->period == 365 ? 'selected' : ''; ?>><?php echo Text::_('COM_MOKOSUITECROSS_PERIOD_365_DAYS'); ?></option>
+            </select>
+        </div>
+        <div class="col-auto">
+            <label class="form-label" for="analytics-service"><?php echo Text::_('COM_MOKOSUITECROSS_ANALYTICS_SERVICE_FILTER'); ?></label>
+            <select name="service_id" id="analytics-service" class="form-select" onchange="this.form.submit();">
+                <option value="0"><?php echo Text::_('COM_MOKOSUITECROSS_ANALYTICS_ALL_SERVICES'); ?></option>
+                <?php foreach ($this->services as $svc) : ?>
+                    <option value="<?php echo (int) $svc['id']; ?>" <?php echo $this->serviceId == $svc['id'] ? 'selected' : ''; ?>>
+                        <?php echo htmlspecialchars($svc['title'] . ' (' . ucfirst($svc['service_type']) . ')'); ?>
+                    </option>
+                <?php endforeach; ?>
+            </select>
+        </div>
+    </div>
+</form>
+
+<?php if (!empty($this->bestTimes)) : ?>
+<div class="card mb-3">
+    <div class="card-header">
+        <h5 class="card-title mb-0"><?php echo Text::_('COM_MOKOSUITECROSS_ANALYTICS_BEST_TIMES'); ?></h5>
+    </div>
+    <div class="card-body">
+        <div class="row">
+            <?php foreach ($this->bestTimes as $bt) :
+                $rate = (int) $bt['total'] > 0 ? round(((int) $bt['success'] / (int) $bt['total']) * 100) : 0;
+            ?>
+            <div class="col-sm-6 col-md-4 col-lg mb-2">
+                <div class="border rounded p-3 text-center h-100">
+                    <div class="fw-bold text-primary"><?php echo $dayNames[(int) $bt['dow']]; ?></div>
+                    <div class="display-6"><?php echo sprintf('%02d:00', (int) $bt['hour_of_day']); ?></div>
+                    <div class="text-muted small">
+                        <?php echo Text::sprintf('COM_MOKOSUITECROSS_ANALYTICS_POSTS_SUCCESS', (int) $bt['success'], (int) $bt['total']); ?>
+                    </div>
+                    <span class="badge bg-success"><?php echo $rate; ?>%</span>
+                </div>
+            </div>
+            <?php endforeach; ?>
+        </div>
+    </div>
+</div>
+<?php else : ?>
+<div class="alert alert-info mb-3">
+    <?php echo Text::_('COM_MOKOSUITECROSS_ANALYTICS_NO_DATA'); ?>
+</div>
+<?php endif; ?>
+
+<div class="card mb-3">
+    <div class="card-header">
+        <h5 class="card-title mb-0"><?php echo Text::_('COM_MOKOSUITECROSS_ANALYTICS_HEATMAP'); ?></h5>
+    </div>
+    <div class="card-body" style="overflow-x: auto;">
+        <table class="table table-sm table-bordered text-center mb-0" style="min-width: 700px;">
+            <thead>
+                <tr>
+                    <th></th>
+                    <?php for ($h = 0; $h < 24; $h++) : ?>
+                        <th class="small" style="width: 3.8%;"><?php echo sprintf('%02d', $h); ?></th>
+                    <?php endfor; ?>
+                </tr>
+            </thead>
+            <tbody>
+            <?php
+            $maxTotal = 1;
+
+            foreach ($this->heatmap as $dayData) {
+                foreach ($dayData as $cell) {
+                    if ($cell['total'] > $maxTotal) {
+                        $maxTotal = $cell['total'];
+                    }
+                }
+            }
+
+            foreach ($this->heatmap as $dow => $hours) : ?>
+                <tr>
+                    <th class="text-nowrap small"><?php echo $dayNames[$dow]; ?></th>
+                    <?php foreach ($hours as $hour => $cell) :
+                        $intensity = $maxTotal > 0 ? $cell['total'] / $maxTotal : 0;
+                        $r = 255;
+                        $g = 255;
+                        $b = 255;
+
+                        if ($cell['total'] > 0) {
+                            $rate = $cell['rate'];
+
+                            if ($rate >= 80) {
+                                $r = (int) (255 - (155 * $intensity));
+                                $g = (int) (255 - (100 * $intensity));
+                                $b = (int) (255 - (155 * $intensity));
+                            } elseif ($rate >= 50) {
+                                $r = (int) (255 - (50 * $intensity));
+                                $g = (int) (255 - (50 * $intensity));
+                                $b = (int) (255 - (200 * $intensity));
+                            } else {
+                                $r = (int) (255 - (35 * $intensity));
+                                $g = (int) (255 - (200 * $intensity));
+                                $b = (int) (255 - (200 * $intensity));
+                            }
+                        }
+                    ?>
+                    <td style="background: rgb(<?php echo "$r,$g,$b"; ?>); cursor: default;"
+                        title="<?php echo $dayNames[$dow] . ' ' . sprintf('%02d:00', $hour) . ': ' . $cell['total'] . ' posts, ' . $cell['success'] . ' success (' . $cell['rate'] . '%)'; ?>">
+                        <?php if ($cell['total'] > 0) : ?>
+                            <small><?php echo $cell['total']; ?></small>
+                        <?php endif; ?>
+                    </td>
+                    <?php endforeach; ?>
+                </tr>
+            <?php endforeach; ?>
+            </tbody>
+        </table>
+        <div class="d-flex justify-content-center gap-3 mt-2 small text-muted">
+            <span><span style="display: inline-block; width: 12px; height: 12px; background: rgb(100,155,100); border: 1px solid #ccc;"></span> <?php echo Text::_('COM_MOKOSUITECROSS_ANALYTICS_LEGEND_HIGH'); ?></span>
+            <span><span style="display: inline-block; width: 12px; height: 12px; background: rgb(205,205,55); border: 1px solid #ccc;"></span> <?php echo Text::_('COM_MOKOSUITECROSS_ANALYTICS_LEGEND_MEDIUM'); ?></span>
+            <span><span style="display: inline-block; width: 12px; height: 12px; background: rgb(220,55,55); border: 1px solid #ccc;"></span> <?php echo Text::_('COM_MOKOSUITECROSS_ANALYTICS_LEGEND_LOW'); ?></span>
+            <span><span style="display: inline-block; width: 12px; height: 12px; background: rgb(255,255,255); border: 1px solid #ccc;"></span> <?php echo Text::_('COM_MOKOSUITECROSS_ANALYTICS_LEGEND_NONE'); ?></span>
+        </div>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-lg-6">
+        <div class="card mb-3">
+            <div class="card-header">
+                <h5 class="card-title mb-0"><?php echo Text::_('COM_MOKOSUITECROSS_ANALYTICS_HOURLY'); ?></h5>
+            </div>
+            <div class="card-body">
+                <canvas id="hourlyChart" height="200"></canvas>
+            </div>
+        </div>
+    </div>
+    <div class="col-lg-6">
+        <div class="card mb-3">
+            <div class="card-header">
+                <h5 class="card-title mb-0"><?php echo Text::_('COM_MOKOSUITECROSS_ANALYTICS_DAILY'); ?></h5>
+            </div>
+            <div class="card-body">
+                <canvas id="dayChart" height="200"></canvas>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.7/dist/chart.umd.min.js" integrity="sha384-UPIssOjNMqMfON6mDKHvO4sOY4hhxN1ymYcfl2MrDz69idMU/L3MNFlyJGlIRjQH" crossorigin="anonymous"></script>
+<script>
+document.addEventListener('DOMContentLoaded', function() {
+    var hourlyData = <?php echo json_encode(array_values($this->hourlyDistribution)); ?>;
+    var hourLabels = [];
+    var hourSuccess = [];
+    var hourFailed = [];
+
+    for (var h = 0; h < 24; h++) {
+        hourLabels.push(('0' + h).slice(-2) + ':00');
+        var found = hourlyData.find(function(d) { return parseInt(d.hour_of_day, 10) === h; });
+        hourSuccess.push(found ? parseInt(found.success, 10) : 0);
+        hourFailed.push(found ? parseInt(found.failed, 10) : 0);
+    }
+
+    new Chart(document.getElementById('hourlyChart'), {
+        type: 'bar',
+        data: {
+            labels: hourLabels,
+            datasets: [
+                { label: '<?php echo Text::_('COM_MOKOSUITECROSS_DASHBOARD_POSTED', true); ?>', data: hourSuccess, backgroundColor: 'rgba(25,135,84,0.7)' },
+                { label: '<?php echo Text::_('COM_MOKOSUITECROSS_DASHBOARD_FAILED', true); ?>', data: hourFailed, backgroundColor: 'rgba(220,53,69,0.7)' }
+            ]
+        },
+        options: {
+            responsive: true,
+            scales: { x: { stacked: true }, y: { stacked: true, beginAtZero: true, ticks: { stepSize: 1 } } },
+            plugins: { legend: { position: 'bottom' } }
+        }
+    });
+
+    var dayData = <?php echo json_encode(array_values($this->dayDistribution)); ?>;
+    var dayLabels = <?php echo json_encode(array_values($dayNames)); ?>;
+    var daySuccess = [];
+    var dayFailed = [];
+
+    for (var d = 1; d <= 7; d++) {
+        var found = dayData.find(function(r) { return parseInt(r.dow, 10) === d; });
+        daySuccess.push(found ? parseInt(found.success, 10) : 0);
+        dayFailed.push(found ? parseInt(found.failed, 10) : 0);
+    }
+
+    new Chart(document.getElementById('dayChart'), {
+        type: 'bar',
+        data: {
+            labels: dayLabels,
+            datasets: [
+                { label: '<?php echo Text::_('COM_MOKOSUITECROSS_DASHBOARD_POSTED', true); ?>', data: daySuccess, backgroundColor: 'rgba(25,135,84,0.7)' },
+                { label: '<?php echo Text::_('COM_MOKOSUITECROSS_DASHBOARD_FAILED', true); ?>', data: dayFailed, backgroundColor: 'rgba(220,53,69,0.7)' }
+            ]
+        },
+        options: {
+            responsive: true,
+            scales: { x: { stacked: true }, y: { stacked: true, beginAtZero: true, ticks: { stepSize: 1 } } },
+            plugins: { legend: { position: 'bottom' } }
+        }
+    });
+});
+</script>

source/packages/com_mokosuitecross/tmpl/calendar/default.php

@@ -0,0 +1,129 @@
+<?php
+
+/**
+ * @package     MokoSuiteCross
+ * @subpackage  com_mokosuitecross
+ * @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\Language\Text;
+use Joomla\CMS\Router\Route;
+
+/** @var \Joomla\Component\MokoSuiteCross\Administrator\View\Calendar\HtmlView $this */
+
+$year   = $this->year;
+$month  = $this->month;
+$events = $this->events;
+$today  = date('Y-m-d');
+
+$prevMonth = $month - 1;
+$prevYear  = $year;
+
+if ($prevMonth < 1) {
+    $prevMonth = 12;
+    $prevYear--;
+}
+
+$nextMonth = $month + 1;
+$nextYear  = $year;
+
+if ($nextMonth > 12) {
+    $nextMonth = 1;
+    $nextYear++;
+}
+
+$monthName    = date('F', mktime(0, 0, 0, $month, 1, $year));
+$daysInMonth  = (int) date('t', mktime(0, 0, 0, $month, 1, $year));
+$firstWeekday = ((int) date('N', mktime(0, 0, 0, $month, 1, $year))) - 1;
+
+$statusClass = static function (string $status): string {
+    return match ($status) {
+        'posted'    => 'bg-success',
+        'failed'    => 'bg-danger',
+        default     => 'bg-warning text-dark',
+    };
+};
+?>
+
+<div class="d-flex justify-content-between align-items-center mb-3">
+    <a href="<?php echo Route::_('index.php?option=com_mokosuitecross&view=calendar&year=' . $prevYear . '&month=' . $prevMonth); ?>"
+       class="btn btn-outline-secondary btn-sm">
+        <span class="icon-chevron-left" aria-hidden="true"></span>
+        <?php echo Text::_('COM_MOKOSUITECROSS_CALENDAR_PREV_MONTH'); ?>
+    </a>
+    <h3 class="mb-0"><?php echo htmlspecialchars($monthName . ' ' . $year); ?></h3>
+    <a href="<?php echo Route::_('index.php?option=com_mokosuitecross&view=calendar&year=' . $nextYear . '&month=' . $nextMonth); ?>"
+       class="btn btn-outline-secondary btn-sm">
+        <?php echo Text::_('COM_MOKOSUITECROSS_CALENDAR_NEXT_MONTH'); ?>
+        <span class="icon-chevron-right" aria-hidden="true"></span>
+    </a>
+</div>
+
+<div class="table-responsive">
+<table class="table table-bordered">
+    <thead class="table-light">
+        <tr>
+            <th style="width:14.28%"><?php echo Text::_('MON'); ?></th>
+            <th style="width:14.28%"><?php echo Text::_('TUE'); ?></th>
+            <th style="width:14.28%"><?php echo Text::_('WED'); ?></th>
+            <th style="width:14.28%"><?php echo Text::_('THU'); ?></th>
+            <th style="width:14.28%"><?php echo Text::_('FRI'); ?></th>
+            <th style="width:14.28%"><?php echo Text::_('SAT'); ?></th>
+            <th style="width:14.28%"><?php echo Text::_('SUN'); ?></th>
+        </tr>
+    </thead>
+    <tbody>
+        <?php
+        $day = 1;
+        $started = false;
+
+        while ($day <= $daysInMonth) : ?>
+        <tr>
+            <?php for ($col = 0; $col < 7; $col++) :
+                if (!$started && $col < $firstWeekday) : ?>
+                    <td class="text-muted bg-light">&nbsp;</td>
+                <?php
+                    continue;
+                endif;
+
+                $started = true;
+
+                if ($day > $daysInMonth) : ?>
+                    <td class="text-muted bg-light">&nbsp;</td>
+                <?php
+                    continue;
+                endif;
+
+                $dateKey   = sprintf('%04d-%02d-%02d', $year, $month, $day);
+                $isToday   = ($dateKey === $today);
+                $cellClass = $isToday ? 'border border-primary border-2 bg-primary bg-opacity-10' : '';
+                $dayEvents = $events[$dateKey] ?? [];
+            ?>
+                <td class="<?php echo $cellClass; ?>" style="vertical-align: top; min-height: 80px;">
+                    <div class="fw-bold mb-1<?php echo $isToday ? ' text-primary' : ''; ?>">
+                        <?php echo $day; ?>
+                        <?php if ($isToday) : ?>
+                            <small class="text-primary"><?php echo Text::_('COM_MOKOSUITECROSS_CALENDAR_TODAY'); ?></small>
+                        <?php endif; ?>
+                    </div>
+                    <?php foreach ($dayEvents as $event) : ?>
+                        <span class="badge <?php echo $statusClass($event->status); ?> mb-1 d-block text-truncate" style="max-width: 100%;"
+                              title="<?php echo htmlspecialchars(ucfirst($event->service_type) . ': ' . $event->article_title . ' (' . $event->status . ')'); ?>">
+                            <?php echo htmlspecialchars(ucfirst($event->service_type)); ?>:
+                            <?php echo htmlspecialchars(mb_substr($event->article_title, 0, 20)); ?>
+                        </span>
+                    <?php endforeach; ?>
+                </td>
+            <?php
+                $day++;
+            endfor; ?>
+        </tr>
+        <?php endwhile; ?>
+    </tbody>
+</table>
+</div>

source/packages/com_mokosuitecross/tmpl/dashboard/default.php

@@ -220,175 +220,6 @@ $queueProcessing = $componentParams->get('queue_processing', 'scheduler');
         </div>
         <?php endif; ?>
 
-        <!-- Analytics: Best Times to Post Heatmap -->
-        <div class="card mt-3">
-            <div class="card-header d-flex justify-content-between align-items-center">
-                <h5 class="card-title mb-0"><?php echo Text::_('COM_MOKOSUITECROSS_ANALYTICS_BEST_TIMES'); ?></h5>
-                <select id="heatmapServiceFilter" class="form-select form-select-sm" style="width: auto;">
-                    <option value=""><?php echo Text::_('COM_MOKOSUITECROSS_ANALYTICS_ALL_PLATFORMS'); ?></option>
-                    <?php
-                    $db = \Joomla\CMS\Factory::getDbo();
-                    $stQuery = $db->getQuery(true)
-                        ->select('DISTINCT ' . $db->quoteName('service_type'))
-                        ->from($db->quoteName('#__mokosuitecross_services'))
-                        ->where($db->quoteName('published') . ' = 1')
-                        ->order($db->quoteName('service_type') . ' ASC');
-                    $db->setQuery($stQuery);
-                    $serviceTypes = $db->loadColumn();
-                    foreach ($serviceTypes as $st) :
-                    ?>
-                        <option value="<?php echo htmlspecialchars($st); ?>"><?php echo htmlspecialchars(ucfirst($st)); ?></option>
-                    <?php endforeach; ?>
-                </select>
-            </div>
-            <div class="card-body">
-                <div id="heatmapContainer">
-                    <p class="text-muted" id="heatmapLoading"><?php echo Text::_('JLIB_HTML_BEHAVIOR_LOADING'); ?></p>
-                    <div id="heatmapNoData" style="display:none;">
-                        <p class="text-muted mb-0"><?php echo Text::_('COM_MOKOSUITECROSS_ANALYTICS_NO_DATA'); ?></p>
-                    </div>
-                    <div id="heatmapGrid" style="display:none;">
-                        <style>
-                            .msc-heatmap { border-collapse: collapse; width: 100%; font-size: 11px; }
-                            .msc-heatmap th, .msc-heatmap td { text-align: center; padding: 3px 2px; min-width: 28px; }
-                            .msc-heatmap th { font-weight: 600; color: #666; font-size: 10px; }
-                            .msc-heatmap td.msc-hm-cell { border-radius: 3px; cursor: default; position: relative; }
-                            .msc-heatmap td.msc-hm-cell:hover { outline: 2px solid #333; z-index: 1; }
-                            .msc-heatmap .msc-hm-day { text-align: right; padding-right: 8px; font-weight: 600; color: #555; white-space: nowrap; }
-                        </style>
-                        <table class="msc-heatmap" id="heatmapTable">
-                            <thead>
-                                <tr>
-                                    <th></th>
-                                    <?php for ($h = 0; $h < 24; $h++) :
-                                        $label = $h % 12 ?: 12;
-                                        $suffix = $h < 12 ? 'a' : 'p';
-                                    ?>
-                                        <th><?php echo $label . $suffix; ?></th>
-                                    <?php endfor; ?>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <?php
-                                $dayLabels = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
-                                for ($d = 0; $d < 7; $d++) :
-                                ?>
-                                <tr>
-                                    <td class="msc-hm-day"><?php echo $dayLabels[$d]; ?></td>
-                                    <?php for ($h = 0; $h < 24; $h++) : ?>
-                                        <td class="msc-hm-cell" id="hm-<?php echo $d; ?>-<?php echo $h; ?>" title="<?php echo $dayLabels[$d] . ' ' . ($h % 12 ?: 12) . ':00 ' . ($h < 12 ? 'AM' : 'PM'); ?>"></td>
-                                    <?php endfor; ?>
-                                </tr>
-                                <?php endfor; ?>
-                            </tbody>
-                        </table>
-                        <div class="d-flex align-items-center justify-content-end mt-2" style="font-size:11px;color:#666;">
-                            <span class="me-1"><?php echo Text::_('COM_MOKOSUITECROSS_ANALYTICS_ENGAGEMENT_RATE'); ?>:</span>
-                            <span style="display:inline-block;width:14px;height:14px;background:#ebedf0;border-radius:2px;margin:0 1px;" title="0%"></span>
-                            <span style="display:inline-block;width:14px;height:14px;background:#9be9a8;border-radius:2px;margin:0 1px;" title="Low"></span>
-                            <span style="display:inline-block;width:14px;height:14px;background:#40c463;border-radius:2px;margin:0 1px;" title="Medium"></span>
-                            <span style="display:inline-block;width:14px;height:14px;background:#30a14e;border-radius:2px;margin:0 1px;" title="High"></span>
-                            <span style="display:inline-block;width:14px;height:14px;background:#216e39;border-radius:2px;margin:0 1px;" title="Very High"></span>
-                        </div>
-                    </div>
-                    <div id="heatmapBestTimes" style="display:none;" class="mt-3 pt-3 border-top">
-                        <strong><?php echo Text::_('COM_MOKOSUITECROSS_ANALYTICS_BEST_TIMES'); ?>:</strong>
-                        <ul id="bestTimesList" class="mb-0 mt-1"></ul>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <script>
-        document.addEventListener('DOMContentLoaded', function() {
-            var token = '<?php echo \Joomla\CMS\Session\Session::getFormToken(); ?>';
-
-            function loadHeatmap(serviceType) {
-                var url = 'index.php?option=com_mokosuitecross&task=analytics.heatmap&format=json'
-                    + '&service_type=' + encodeURIComponent(serviceType || '')
-                    + '&days=90&' + token + '=1';
-
-                document.getElementById('heatmapLoading').style.display = '';
-                document.getElementById('heatmapGrid').style.display = 'none';
-                document.getElementById('heatmapNoData').style.display = 'none';
-                document.getElementById('heatmapBestTimes').style.display = 'none';
-
-                fetch(url)
-                    .then(function(r) { return r.json(); })
-                    .then(function(data) {
-                        document.getElementById('heatmapLoading').style.display = 'none';
-
-                        if (!data.success) {
-                            document.getElementById('heatmapNoData').style.display = '';
-                            return;
-                        }
-
-                        var grid = data.grid;
-                        var maxRate = 0;
-                        var hasData = false;
-
-                        for (var d = 0; d < 7; d++) {
-                            for (var h = 0; h < 24; h++) {
-                                var rate = grid[d] && grid[d][h] ? parseFloat(grid[d][h].avg_rate) : 0;
-                                if (rate > maxRate) maxRate = rate;
-                                if (rate > 0) hasData = true;
-                            }
-                        }
-
-                        if (!hasData) {
-                            document.getElementById('heatmapNoData').style.display = '';
-                            return;
-                        }
-
-                        document.getElementById('heatmapGrid').style.display = '';
-
-                        var colors = ['#ebedf0', '#9be9a8', '#40c463', '#30a14e', '#216e39'];
-                        for (var d = 0; d < 7; d++) {
-                            for (var h = 0; h < 24; h++) {
-                                var cell = document.getElementById('hm-' + d + '-' + h);
-                                if (!cell) continue;
-                                var val = grid[d] && grid[d][h] ? grid[d][h] : {avg_rate: 0, post_count: 0};
-                                var rate = parseFloat(val.avg_rate);
-                                var count = parseInt(val.post_count, 10);
-                                var level = 0;
-                                if (maxRate > 0 && rate > 0) {
-                                    var pct = rate / maxRate;
-                                    if (pct <= 0.25) level = 1;
-                                    else if (pct <= 0.50) level = 2;
-                                    else if (pct <= 0.75) level = 3;
-                                    else level = 4;
-                                }
-                                cell.style.backgroundColor = colors[level];
-                                cell.title = cell.title.split(' - ')[0] + ' - ' + rate.toFixed(1) + '% (' + count + ' posts)';
-                            }
-                        }
-
-                        // Show best times
-                        if (data.best_times && data.best_times.length > 0) {
-                            document.getElementById('heatmapBestTimes').style.display = '';
-                            var list = document.getElementById('bestTimesList');
-                            list.innerHTML = '';
-                            var top = data.best_times.slice(0, 3);
-                            for (var i = 0; i < top.length; i++) {
-                                var bt = top[i];
-                                var li = document.createElement('li');
-                                li.textContent = bt.day_name + ' at ' + bt.hour_label + ' (' + bt.avg_rate.toFixed(1) + '% avg engagement)';
-                                list.appendChild(li);
-                            }
-                        }
-                    })
-                    .catch(function() {
-                        document.getElementById('heatmapLoading').style.display = 'none';
-                        document.getElementById('heatmapNoData').style.display = '';
-                    });
-            }
-
-            document.getElementById('heatmapServiceFilter').addEventListener('change', function() {
-                loadHeatmap(this.value);
-            });
-
-            loadHeatmap('');
-        });
-        </script>
         <!-- Recent Activity -->
         <div class="card mt-3">
             <div class="card-header">
@@ -451,6 +282,10 @@ $queueProcessing = $componentParams->get('queue_processing', 'scheduler');
                        class="list-group-item list-group-item-action">
                         <?php echo Text::_('COM_MOKOSUITECROSS_SUBMENU_LOGS'); ?>
                     </a>
+                    <a href="<?php echo Route::_('index.php?option=com_mokosuitecross&view=analytics'); ?>"
+                       class="list-group-item list-group-item-action">
+                        <?php echo Text::_('COM_MOKOSUITECROSS_SUBMENU_ANALYTICS'); ?>
+                    </a>
                 </div>
             </div>
         </div>

source/packages/plg_content_mokosuitecross/mokosuitecross.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="content" method="upgrade">
     <name>Content - MokoSuiteCross</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_activitypub/activitypub.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - ActivityPub (Fediverse)</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_blogger/blogger.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Google Blogger</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_bluesky/bluesky.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Bluesky</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_brevo/brevo.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Brevo (Sendinblue)</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_constantcontact/constantcontact.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Constant Contact</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_convertkit/convertkit.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - ConvertKit</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_devto/devto.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Dev.to</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_discord/discord.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Discord</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_facebook/facebook.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Facebook / Meta</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_ghost/ghost.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Ghost</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_googlebusiness/googlebusiness.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Google Business Profile</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_googlechat/googlechat.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Google Chat</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_hashnode/hashnode.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Hashnode</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_instagram/instagram.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Instagram</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-06-23</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_linkedin/linkedin.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - LinkedIn</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_mailchimp/mailchimp.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Mailchimp</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_mastodon/mastodon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Mastodon</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_matrix/matrix.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Matrix / Element</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_medium/medium.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Medium</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_mokosuitecalendar/mokosuitecalendar.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - MokoSuiteCalendar Events</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_mokosuitegallery/mokosuitegallery.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - MokoSuiteGallery</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_nostr/nostr.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Nostr</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_ntfy/ntfy.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Ntfy Push Notifications</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_pinterest/pinterest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Pinterest</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_reddit/reddit.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Reddit</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_rssfeed/rssfeed.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - RSS Feed</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_sendgrid/sendgrid.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - SendGrid</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_slack/slack.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Slack</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_teams/teams.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Microsoft Teams</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_telegram/telegram.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Telegram</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_threads/threads.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Threads (Meta)</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_tiktok/tiktok.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - TikTok</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_tumblr/tumblr.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Tumblr</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_twitter/twitter.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - X / Twitter</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_webhook/webhook.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Generic Webhook</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_whatsapp/whatsapp.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - WhatsApp Business</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_wordpress/wordpress.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - WordPress</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_mokosuitecross_youtube/youtube.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="mokosuitecross" method="upgrade">
     <name>MokoSuiteCross - Youtube</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-06-23</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_system_mokosuitecross/mokosuitecross.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="system" method="upgrade">
     <name>System - MokoSuiteCross</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_system_mokosuitecross_events/mokosuitecross_events.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="system" method="upgrade">
     <name>System - MokoSuiteCross Events</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_system_mokosuitecross_gallery/mokosuitecross_gallery.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="system" method="upgrade">
     <name>System - MokoSuiteCross Gallery</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_task_mokosuitecross/mokosuitecross.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="task" method="upgrade">
     <name>Task - MokoSuiteCross Queue Processor</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/packages/plg_webservices_mokosuitecross/mokosuitecross.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="webservices" method="upgrade">
     <name>Web Services - MokoSuiteCross</name>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>

source/pkg_mokosuitecross.xml

@@ -2,7 +2,7 @@
 <extension type="package" method="upgrade">
     <name>MokoSuiteCross</name>
     <packagename>mokosuitecross</packagename>
-    <version>01.08.54</version>
+    <version>01.08.61</version>
     <creationDate>2026-05-28</creationDate>
     <author>Moko Consulting</author>
     <authorEmail>hello@mokoconsulting.tech</authorEmail>