chore: bump version to 1.9.9

.gitea/workflows/release.yml

@@ -0,0 +1,25 @@
+name: Build & Release Plugin
+
+on:
+  workflow_dispatch:
+    inputs:
+      release_notes:
+        description: "Optionele release-opmerkingen"
+        required: false
+  push:
+    branches: [ main ]
+    paths:
+      - 'groq-ai-product-text.php'
+      - 'includes/**'
+      - 'assets/**'
+      - 'languages/**'
+
+jobs:
+  release:
+    uses: roberto/ci-workflows/.gitea/workflows/wp-plugin-release.yml@c6393ed47258d6f040ceeed3994b17b7faa3ef23
+    with:
+      main_file: groq-ai-product-text.php
+      slug: siti-ai-product-content-generator
+      release_body: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.release_notes || '' }}
+    secrets:
+      RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}

.github/workflows/release.yml

@@ -1,199 +0,0 @@
-name: Build & Release Plugin
-
-on:
-  workflow_dispatch:
-    inputs:
-      release_notes:
-        description: 'Optionele release-opmerkingen'
-        required: false
-  push:
-    branches:
-      - main
-    paths:
-      - 'groq-ai-product-text.php'
-      - 'includes/**'
-      - 'assets/**'
-      - 'README.md'
-      - '.github/workflows/release.yml'
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-
-      - name: Determine plugin version
-        id: meta
-        run: |
-          VERSION=$(grep -E "^\s*\*\s*Version:" -m 1 groq-ai-product-text.php | sed -E 's/.*Version:\s*//')
-          VERSION=$(echo "$VERSION" | tr -d '\r')
-          if [ -z "$VERSION" ]; then
-            echo "::error::Kon pluginversie niet bepalen."
-            exit 1
-          fi
-          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
-
-      - name: Genereer manifest.json uit plugin header
-        run: |
-          python3 - <<'PY'
-          import json
-          import re
-
-          with open('groq-ai-product-text.php', 'r', encoding='utf-8') as handle:
-            content = handle.read()
-
-          header_match = re.search(r'/\*\*(.*?)\*/', content, re.S)
-          header = header_match.group(1) if header_match else ''
-
-          def read_field(label: str) -> str:
-            match = re.search(r'^\s*\*\s*' + re.escape(label) + r'\s*:\s*(.+)$', header, re.M)
-            return match.group(1).strip() if match else ''
-
-          manifest = {
-            'plugin_name': read_field('Plugin Name'),
-            'description': read_field('Description'),
-            'version': read_field('Version'),
-            'author': read_field('Author'),
-            'author_url': read_field('Author URI'),
-          }
-
-          with open('manifest.json', 'w', encoding='utf-8') as handle:
-            json.dump(manifest, handle, ensure_ascii=False, indent=2)
-
-          print('manifest.json aangemaakt/bijgewerkt')
-          PY
-
-      - name: Commit & push manifest.json
-        run: |
-          if git diff --quiet -- manifest.json; then
-            echo "manifest.json ongewijzigd; geen commit nodig."
-            exit 0
-          fi
-
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git add manifest.json
-          git commit -m "chore: update manifest.json"
-          git push
-
-      - name: Check if tag exists
-        id: tagcheck
-        run: |
-          TAG="v${{ steps.meta.outputs.version }}"
-          if git ls-remote --tags origin "refs/tags/$TAG" | grep -q "refs/tags/$TAG$"; then
-            echo "exists=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "exists=false" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: Tag bestaat al – workflow afronden
-        if: steps.tagcheck.outputs.exists == 'true'
-        run: |
-          echo "Tag v${{ steps.meta.outputs.version }} bestaat al. Release wordt overgeslagen."
-
-      - name: Build distributie-zip
-        if: steps.tagcheck.outputs.exists == 'false'
-        id: package
-        run: |
-          if ! command -v zip >/dev/null 2>&1; then
-            apt-get update -y
-            apt-get install -y zip
-          fi
-
-          VERSION="${{ steps.meta.outputs.version }}"
-          SLUG="siti-ai-product-content-generator"
-          BUILD_ROOT="$RUNNER_TEMP/build"
-          DEST_DIR="$BUILD_ROOT/$SLUG"
-          mkdir -p "$DEST_DIR"
-
-          tar -cf - \
-            --exclude='.git' \
-            --exclude='.github' \
-            --exclude='docker' \
-            --exclude='docs' \
-            --exclude='dist' \
-            --exclude='docker-compose.yml' \
-            --exclude='PLAN.md' \
-            . | tar -xf - -C "$DEST_DIR"
-
-          mkdir -p dist
-          ZIP_PATH="dist/${SLUG}-${VERSION}.zip"
-          (cd "$BUILD_ROOT" && zip -r "$GITHUB_WORKSPACE/$ZIP_PATH" "$SLUG")
-
-          echo "asset_path=$ZIP_PATH" >> "$GITHUB_OUTPUT"
-          echo "asset_name=${SLUG}-${VERSION}.zip" >> "$GITHUB_OUTPUT"
-
-      - name: Maak Gitea release
-        if: steps.tagcheck.outputs.exists == 'false'
-        env:
-          RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-          RELEASE_SERVER_URL: ${{ vars.RELEASE_SERVER_URL }}
-          RELEASE_REPOSITORY: ${{ vars.RELEASE_REPOSITORY }}
-        run: |
-          VERSION="${{ steps.meta.outputs.version }}"
-          TAG="v$VERSION"
-          ASSET_PATH="${{ steps.package.outputs.asset_path }}"
-          ASSET_NAME="${{ steps.package.outputs.asset_name }}"
-
-          if [ -z "$RELEASE_TOKEN" ]; then
-            echo "::error::RELEASE_TOKEN ontbreekt. Voeg deze secret toe om releases te kunnen maken."
-            exit 1
-          fi
-
-          SERVER_URL="${RELEASE_SERVER_URL:-${GITHUB_SERVER_URL}}"
-          REPO="${RELEASE_REPOSITORY:-${GITHUB_REPOSITORY}}"
-          if [ -z "$SERVER_URL" ] || [ -z "$REPO" ]; then
-            echo "::error::Kan server of repository niet bepalen. Stel RELEASE_SERVER_URL en RELEASE_REPOSITORY in."
-            exit 1
-          fi
-
-          API_URL="${SERVER_URL%/}/api/v1"
-
-          export TAG
-          python3 - <<'PY'
-          import json
-          import os
-
-          payload = {
-              "tag_name": os.environ["TAG"],
-              "name": f"Siti AI Product Teksten {os.environ['TAG']}",
-              "body": f"Automatische release op basis van versie {os.environ['TAG'][1:]}",
-              "target_commitish": os.environ.get("GITHUB_SHA") or os.environ.get("GITEA_SHA", ""),
-          }
-
-          with open("release.json", "w", encoding="utf-8") as handle:
-              json.dump(payload, handle, ensure_ascii=False)
-          PY
-
-          curl -sS -X POST "$API_URL/repos/$REPO/releases" \
-            -H "Authorization: token $RELEASE_TOKEN" \
-            -H "Content-Type: application/json" \
-            -d @release.json \
-            -o release-response.json
-
-          RELEASE_ID=$(python3 - <<'PY'
-          import json
-
-          with open('release-response.json', 'r', encoding='utf-8') as handle:
-              data = json.load(handle)
-
-          print(data.get('id', ''))
-          PY
-          )
-
-          if [ -z "$RELEASE_ID" ]; then
-            echo "::error::Kon release-ID niet bepalen. Response: $(cat release-response.json)"
-            exit 1
-          fi
-
-          curl -sS -X POST "$API_URL/repos/$REPO/releases/$RELEASE_ID/assets?name=$ASSET_NAME" \
-            -H "Authorization: token $RELEASE_TOKEN" \
-            -H "Content-Type: application/zip" \
-            --data-binary "@$ASSET_PATH"
-

groq-ai-product-text.php

@@ -2,7 +2,7 @@
 /**
  * Plugin Name: SitiAI Product Teksten
  * Description: Genereer productteksten met diverse AI-aanbieders rechtstreeks vanuit WooCommerce.
- * Version: 1.9.7
+ * Version: 1.9.9
  * Author: Roberto Guagliardo | SitiWeb
  * Author URI: https://sitiweb.nl/
  * Text Domain: siti-ai-product-content-generator

includes/SitiWebUpdater2.php

@@ -6,7 +6,8 @@
  * Updates plugins via the Siti Plugin Repo API instead of GitHub
  * Fully self-contained with built-in license management
  */
-class SitiWebUpdater2 {
+class SitiWebUpdater2
+{
 
     private static $instances = array();
     private static $global_settings_registered = false;
@@ -22,7 +23,8 @@ class SitiWebUpdater2 {
     private $plugin_response;
     private $option_prefix;
 
-    public function __construct( $file ) {
+    public function __construct($file)
+    {
         $this->file = $file;
         $this->option_prefix = 'siti_updater_' . sanitize_key(dirname(plugin_basename($this->file))) . '_';
         $this->set_plugin_properties();
@@ -41,7 +43,8 @@ class SitiWebUpdater2 {
         return $this;
     }
 
-    public function initialize() {
+    public function initialize()
+    {
         add_filter('pre_set_site_transient_update_plugins', array($this, 'check_for_updates'));
         add_filter('plugins_api', array($this, 'plugin_info'), 10, 3);
 
@@ -52,7 +55,8 @@ class SitiWebUpdater2 {
         }
     }
 
-    public function set_plugin_properties() {
+    public function set_plugin_properties()
+    {
         if (!function_exists('get_plugin_data')) {
             require_once ABSPATH . 'wp-admin/includes/plugin.php';
         }
@@ -62,23 +66,28 @@ class SitiWebUpdater2 {
         $this->active = is_plugin_active($this->basename);
     }
 
-    public static function get_instances() {
+    public static function get_instances()
+    {
         return self::$instances;
     }
 
-    public function get_plugin_data() {
+    public function get_plugin_data()
+    {
         return $this->plugin;
     }
 
-    public function set_owner( $owner ) {
+    public function set_owner($owner)
+    {
         $this->owner = $owner;
     }
 
-    public function set_repository( $repository ) {
+    public function set_repository($repository)
+    {
         $this->repository = $repository;
     }
 
-    public function set_license_key( $key ) {
+    public function set_license_key($key)
+    {
         $sanitized_key = sanitize_text_field((string) $key);
         $stored_key = get_option($this->option_prefix . 'license_key', '');
 
@@ -90,33 +99,57 @@ class SitiWebUpdater2 {
         update_option($this->option_prefix . 'license_key', $sanitized_key);
     }
 
-    public function get_license_key() {
+    public function get_license_key()
+    {
         if (null === $this->license_key) {
             $this->license_key = get_option($this->option_prefix . 'license_key', '');
         }
         return $this->license_key;
     }
 
-    public function get_license_data() {
+    public function get_license_data()
+    {
         return $this->get_stored_license_data();
     }
 
-    public function set_api_base_url( $api_base_url ) {
+    public function set_api_base_url($api_base_url)
+    {
         $this->api_base_url = rtrim((string) $api_base_url, '/');
     }
 
-    private function get_stored_license_data() {
+    private function normalize_version($version)
+    {
+        if (!is_string($version)) {
+            return $version;
+        }
+
+        $version = trim($version);
+        if ('' === $version) {
+            return $version;
+        }
+
+        if (0 === stripos($version, 'v')) {
+            $version = ltrim($version, 'vV');
+        }
+
+        return $version;
+    }
+
+    private function get_stored_license_data()
+    {
         $data = get_option($this->option_prefix . 'license_data', array());
 
         return is_array($data) ? $data : array();
     }
 
-    private function clear_cached_license_data() {
+    private function clear_cached_license_data()
+    {
         delete_option($this->option_prefix . 'license_data');
         delete_option($this->option_prefix . 'last_check');
     }
 
-    private function store_license_data( $body ) {
+    private function store_license_data($body)
+    {
         if (!is_array($body)) {
             $body = array();
         }
@@ -143,14 +176,15 @@ class SitiWebUpdater2 {
         }
 
         if ($version) {
-            $license_data['pluginVersion'] = $version;
+            $license_data['pluginVersion'] = $this->normalize_version($version);
         }
 
         update_option($this->option_prefix . 'license_data', $license_data);
         update_option($this->option_prefix . 'last_check', current_time('mysql'));
     }
 
-    private function get_plugin_info() {
+    private function get_plugin_info()
+    {
         if (is_null($this->plugin_response)) {
             $request_uri = sprintf('%s/api/plugins/%s/%s', $this->api_base_url, $this->owner, $this->repository);
 
@@ -168,11 +202,15 @@ class SitiWebUpdater2 {
             }
 
             $body = json_decode(wp_remote_retrieve_body($response), true);
+            if (is_array($body) && isset($body['version'])) {
+                $body['version'] = $this->normalize_version($body['version']);
+            }
             $this->plugin_response = $body;
         }
     }
 
-    public function check_for_updates( $transient ) {
+    public function check_for_updates($transient)
+    {
         if (empty($transient->checked)) {
             return $transient;
         }
@@ -183,10 +221,10 @@ class SitiWebUpdater2 {
             return $transient;
         }
 
-        $remote_version = $this->plugin_response['version'];
-        $current_version = $this->plugin['Version'];
+        $remote_version = $this->normalize_version($this->plugin_response['version']);
+        $current_version = $this->normalize_version($this->plugin['Version']);
 
-        if ( version_compare( $remote_version, $current_version, '>' ) ) {
+        if ($remote_version && version_compare($remote_version, $current_version, '>')) {
             $download_url = $this->get_download_url('latest');
 
             if (!is_wp_error($download_url)) {
@@ -203,7 +241,8 @@ class SitiWebUpdater2 {
         return $transient;
     }
 
-    public function plugin_info( $result, $action, $args ) {
+    public function plugin_info($result, $action, $args)
+    {
         if ('plugin_information' !== $action || $args->slug !== dirname($this->basename)) {
             return $result;
         }
@@ -217,7 +256,7 @@ class SitiWebUpdater2 {
         return (object) array(
             'name' => $this->plugin_response['name'] ?? $this->plugin['Name'],
             'slug' => $args->slug,
-            'version'       => $this->plugin_response['version'],
+            'version' => $this->normalize_version($this->plugin_response['version'] ?? $this->plugin['Version']),
             'author' => $this->plugin_response['author'] ?? $this->plugin['Author'],
             'author_profile' => $this->plugin_response['author_url'] ?? $this->plugin['AuthorURI'],
             'homepage' => $this->plugin_response['homepage'] ?? '',
@@ -233,7 +272,8 @@ class SitiWebUpdater2 {
         );
     }
 
-    private function get_download_url( $version = 'latest' ) {
+    private function get_download_url($version = 'latest')
+    {
         $license_key = $this->get_license_key();
         if (empty($license_key)) {
             return new WP_Error('no_license', 'Geen licentie ingesteld');
@@ -243,7 +283,8 @@ class SitiWebUpdater2 {
         return $this->api_base_url . '/api/licenses/download?key=' . urlencode($license_key) . '&hostname=' . urlencode($hostname) . '&version=' . urlencode($version);
     }
 
-    public function verify_license() {
+    public function verify_license()
+    {
         $license_key = $this->get_license_key();
         if (empty($license_key)) {
             return new WP_Error('missing_license', 'Geen licentiecode ingesteld.');
@@ -305,7 +346,8 @@ class SitiWebUpdater2 {
         return $body;
     }
 
-    public function is_license_valid() {
+    public function is_license_valid()
+    {
         $data = $this->get_license_data();
         if (empty($data) || empty($data['key'])) {
             return false;
@@ -318,22 +360,24 @@ class SitiWebUpdater2 {
         return true;
     }
 
-    public function get_latest_known_version() {
+    public function get_latest_known_version()
+    {
         $this->get_plugin_info();
 
         if (!empty($this->plugin_response['version'])) {
-            return $this->plugin_response['version'];
+            return $this->normalize_version($this->plugin_response['version']);
         }
 
         $license_data = $this->get_license_data();
         if (isset($license_data['pluginVersion']) && $license_data['pluginVersion']) {
-            return $license_data['pluginVersion'];
+            return $this->normalize_version($license_data['pluginVersion']);
         }
 
         return null;
     }
 
-    public function admin_notices() {
+    public function admin_notices()
+    {
         if (!current_user_can('manage_options')) {
             return;
         }
@@ -350,14 +394,16 @@ class SitiWebUpdater2 {
         }
     }
 
-    public function daily_license_check() {
+    public function daily_license_check()
+    {
         $result = $this->verify_license();
         if (is_wp_error($result)) {
             error_log($this->plugin['Name'] . ' License check failed: ' . $result->get_error_message());
         }
     }
 
-    public function add_global_settings_page() {
+    public function add_global_settings_page()
+    {
         add_options_page(
             __('Plugin Licenties', 'siti-updater'),
             __('Plugin Licenties', 'siti-updater'),
@@ -367,7 +413,8 @@ class SitiWebUpdater2 {
         );
     }
 
-    public function render_global_settings_page() {
+    public function render_global_settings_page()
+    {
         if (!current_user_can('manage_options')) {
             return;
         }
@@ -426,10 +473,8 @@ class SitiWebUpdater2 {
                                     <small><?php echo esc_html($plugin_data['Description']); ?></small>
                                 </td>
                                 <td>
-                                    <input type="text" 
-                                           name="<?php echo esc_attr( $prefix . 'license_key' ); ?>" 
-                                           value="<?php echo esc_attr( $instance->get_license_key() ); ?>" 
-                                           class="regular-text" 
+                                    <input type="text" name="<?php echo esc_attr($prefix . 'license_key'); ?>"
+                                        value="<?php echo esc_attr($instance->get_license_key()); ?>" class="regular-text"
                                         placeholder="<?php esc_attr_e('Voer licentiecode in...', 'siti-updater'); ?>" />
                                     <p class="description">
                                         <?php printf(esc_html__('Licentie voor %s. Verkrijg je code van plugins.robert.ooo', 'siti-updater'), $plugin_data['Name']); ?>
@@ -446,7 +491,8 @@ class SitiWebUpdater2 {
                                 <td>
                                     <?php echo esc_html($latest_version); ?>
                                     <?php if ($latest_version && '-' !== $latest_version && version_compare($latest_version, $current_version, '>')): ?>
-                                        <br><small style="color: orange;"><?php esc_html_e( 'Update beschikbaar!', 'siti-updater' ); ?></small>
+                                        <br><small
+                                            style="color: orange;"><?php esc_html_e('Update beschikbaar!', 'siti-updater'); ?></small>
                                     <?php endif; ?>
                                 </td>
                             </tr>
@@ -454,7 +500,8 @@ class SitiWebUpdater2 {
                     </tbody>
                 </table>
                 <p class="submit">
-                    <input type="submit" name="siti_updater_save" class="button button-primary" value="<?php esc_attr_e( 'Licenties opslaan', 'siti-updater' ); ?>" />
+                    <input type="submit" name="siti_updater_save" class="button button-primary"
+                        value="<?php esc_attr_e('Licenties opslaan', 'siti-updater'); ?>" />
                 </p>
             </form>
         </div>

manifest.json

@@ -1,7 +1,7 @@
 {
   "plugin_name": "SitiAI Product Teksten",
   "description": "Genereer productteksten met diverse AI-aanbieders rechtstreeks vanuit WooCommerce.",
-  "version": "1.9.6",
+  "version": "1.9.8",
   "author": "Roberto Guagliardo | SitiWeb",
   "author_url": "https://sitiweb.nl/"
 }