Merge branch 'main' into auto-update

Reviewed-on: #3

.gitea/workflows/release.yml

@@ -0,0 +1,76 @@
+name: Create Release
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          username: ${{ secrets.CI_USER }}
+          password: ${{ secrets.CI_TOKEN }}
+          fetch-depth: 0  # Important: Fetch all history for commit messages
+
+      - name: Get version
+        id: get_version
+        run: |
+          if [ "${{ github.ref_type }}" = "tag" ]; then
+            echo "version=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+          else
+            echo "version=$(date +'%Y.%m.%d-%H%M')" >> $GITHUB_OUTPUT
+          fi
+
+      # NEW STEP: Generate release notes from commits
+      - name: Generate release notes
+        id: release_notes
+        run: |
+          # Find the most recent tag
+          LATEST_TAG=$(git describe --tags --abbrev=0 --always 2>/dev/null || echo "none")
+          
+          if [ "$LATEST_TAG" = "none" ]; then
+            # If no previous tag exists, get all commits
+            COMMITS=$(git log --pretty=format:"* %s (%h)" --no-merges)
+          else
+            # Get commits since the last tag
+            COMMITS=$(git log --pretty=format:"* %s (%h)" ${LATEST_TAG}..HEAD --no-merges)
+          fi
+          
+          # Escape newlines and special characters for GitHub Actions
+          COMMITS="${COMMITS//'%'/'%25'}"
+          COMMITS="${COMMITS//$'\n'/'%0A'}"
+          COMMITS="${COMMITS//$'\r'/'%0D'}"
+          
+          # Create release notes with header
+          NOTES="## What's New in ${{ steps.get_version.outputs.version }}%0A%0A"
+          NOTES+="$COMMITS"
+          
+          # Output to GitHub Actions
+          echo "notes<<EOF" >> $GITHUB_OUTPUT
+          echo "$NOTES" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+
+      - name: Update plugin version
+        run: |
+          # Replace version placeholder with actual version
+          sed -i "s/Version: {auto_update_value_on_deploy}/Version: ${{ steps.get_version.outputs.version }}/" fw-store-embed.php
+          # Verify the change was made
+          grep "Version:" fw-store-embed.php
+
+      - name: Create ZIP archive
+        run: |
+          zip -r fourthwall-store-embed.zip . -x ".git/*" ".gitea/*"
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v2
+        with:
+          token: "${{ secrets.REPO_TOKEN }}"
+          title: Fourthwall-store-embed Release ${{ steps.get_version.outputs.version }}
+          tag_name: ${{ steps.get_version.outputs.version }}
+          body: "${{ steps.release_notes.outputs.notes }}"
+          files: |
+            fourthwall-store-embed.zip

.gitea/workflows/update-version.yml

@@ -0,0 +1,49 @@
+name: Update Plugin Version
+
+on:
+  release:
+    types: [created, edited]
+
+jobs:
+  update-version:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Get release tag
+        id: get_tag
+        run: echo "TAG=${GITEA_REF#refs/tags/}" >> $GITEA_ENV
+
+      - name: Update version in plugin file
+        run: |
+          # Replace version in main plugin file
+          sed -i "s/Version: .*/Version: ${{ env.TAG }}/" fw-store-embed.php
+          
+          # Verify change
+          grep "Version:" fw-store-embed.php
+
+      - name: Commit changes
+        run: |
+          git config --local user.email "action@gitea.com"
+          git config --local user.name "Gitea Action"
+          git add fw-store-embed.php
+          git commit -m "Update version to ${{ env.TAG }}"
+          git push
+
+      - name: Create plugin zip
+        run: |
+          mkdir -p build
+          zip -r build/fourthwall-store-embed.zip . -x ".git/*" ".gitea/*" "build/*" "*.git*"
+
+      - name: Upload zip to release
+        uses: actions/upload-release-asset@v1
+        env:
+          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+        with:
+          upload_url: ${{ gitea.event.release.upload_url }}
+          asset_path: build/fourthwall-store-embed.zip
+          asset_name: fourthwall-store-embed.zip
+          asset_content_type: application/zip

README.md

@@ -1,3 +1,12 @@
 # fourth-wall-embed-wp
 
-A WordPress Plugin to embed a fourth wall embed
+A WordPress Plugin to embed a fourth wall embed.
+
+### How to use the plugin
+
+* Download the latest release from [releases](https://repo.anhonesthost.net/CyberCoveLLC/fourth-wall-embed-wp/releases)
+* Upload the Plugin to WordPress
+* In the WordPress Dashboard, Navigate to the Fourthwall settings page, and paste your store url.
+* On the page you want have your store displayed, add the shortcode ```[fourthwall]```
+
+This is an early release of the plugin, and if you can think of things that could be improved or find any bugs, please open an issue on the repository.

css/fw-store-embed.css

@@ -1,6 +1,6 @@
 .fw-store-parent {
     align-content: center;
-    vertical-align: top;
+    vertical-align: bottom;
     overflow-y: auto;
     text-align:center;
     margin:0 auto;
@@ -9,11 +9,11 @@
 
 .product-tile {
     align-content: center;
-    vertical-align: top;
+    vertical-align: bottom;
     background: white;
     display:inline-block;
-    width:200px;
+    width:225px;
-    margin:0 25px 25px;
+    margin:15px 15px 15px 15px;
 
 }
 
@@ -35,3 +35,8 @@
     font-size: 20px;
     font-style: italic;
 }
+
+.tile__heading {
+    font-size: 0.88em;  /* Reduced font size for product titles */
+    font-weight: bold;
+}

fw-store-embed.php

@@ -3,12 +3,13 @@
  * Plugin Name: Fourthwall Store Embed
  * Plugin URL: https://cybercove.io/
  * Description: Embed Fourthwall Store in WordPress
- * Version: 1.0.0.
+ * Version: {auto_update_value_on_deploy}
  * Author: Joshua Knapp
  * Text Domain: fourthwall_text_domain
  *
  */
 
+include("libs/self-update.php");
 include("libs/settings.php");
 include("libs/shortcode.php");
 function set_fw_store_embed_css() {

libs/self-update.php

@@ -0,0 +1,199 @@
+<?php
+/**
+ * Plugin update functionality
+ */
+
+// Don't execute directly
+if (!defined('ABSPATH')) {
+    exit;
+}
+
+function fwembed_check_for_updates() {
+    // IMPORTANT: Get the main plugin file path correctly
+    $main_plugin_file = dirname(dirname(__FILE__)) . '/fw-store-embed.php';
+    $plugin_slug = plugin_basename($main_plugin_file);
+    
+    // Get plugin data from main file
+    if (!function_exists('get_plugin_data')) {
+        require_once(ABSPATH . 'wp-admin/includes/plugin.php');
+    }
+    
+    // Get plugin data from main plugin file (not this file)
+    $plugin_data = get_plugin_data($main_plugin_file);
+    $current_version = !empty($plugin_data['Version']) ? $plugin_data['Version'] : '0.0.1';
+    
+    // Debug data
+    $debug_data = [
+        'current_version' => $current_version,
+        'main_plugin_file' => $main_plugin_file,
+        'plugin_slug' => $plugin_slug,
+        'time' => current_time('mysql')
+    ];
+    
+    // URL to your Gitea releases API
+    $gitea_api_url = 'https://repo.anhonesthost.net/api/v1/repos/wp-plugins/fourth-wall-embed-wp/releases/latest';
+    
+    // Use cURL to fetch release data
+    $ch = curl_init();
+    curl_setopt($ch, CURLOPT_URL, $gitea_api_url);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+    curl_setopt($ch, CURLOPT_HTTPHEADER, ['Accept: application/json']);
+    curl_setopt($ch, CURLOPT_USERAGENT, 'WordPress/Fourth-Wall-Plugin-Updater');
+    curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+    curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+    
+    $response = curl_exec($ch);
+    curl_close($ch);
+    
+    if ($response) {
+        $release_info = json_decode($response);
+        
+        // Update debug info with latest version
+        $debug_data['latest_version'] = $release_info->tag_name ?? 'Not found';
+        $debug_data['response'] = substr(print_r($release_info, true), 0, 1000);
+        update_option('fwembed_update_debug', $debug_data);
+        
+        // Get latest version from tag name
+        $latest_version = $release_info->tag_name;
+        
+        // Simple version comparison - we want any update to trigger if version is different
+        if ($current_version != $latest_version) {
+            // Get the download URL for the ZIP
+            $download_url = null;
+            if (isset($release_info->assets) && is_array($release_info->assets)) {
+                foreach ($release_info->assets as $asset) {
+                    if (isset($asset->name) && strpos($asset->name, '.zip') !== false) {
+                        $download_url = $asset->browser_download_url;
+                        break;
+                    }
+                }
+            }
+            
+            // Hook into WordPress update system
+            add_filter('site_transient_update_plugins', function($transient) use ($plugin_slug, $current_version, $latest_version, $download_url) {
+                // Initialize if needed
+                if (!is_object($transient)) {
+                    $transient = new stdClass();
+                }
+                if (empty($transient->checked)) {
+                    $transient->checked = [];
+                }
+                
+                // Add our plugin to the checked list
+                $transient->checked[$plugin_slug] = $current_version;
+                
+                if (empty($transient->response)) {
+                    $transient->response = [];
+                }
+                
+                // Add to the update list
+                $transient->response[$plugin_slug] = (object) [
+                    'id' => 'fourthwall-store-embed',
+                    'slug' => 'fourthwall-store-embed',
+                    'plugin' => $plugin_slug,
+                    'new_version' => $latest_version,
+                    'url' => 'https://repo.anhonesthost.net/wp-plugins/fourth-wall-embed-wp',
+                    'package' => $download_url,
+                    'icons' => [],
+                    'banners' => [],
+                    'tested' => '6.4.2',
+                    'requires' => '5.0',
+                    'compatibility' => new stdClass(),
+                ];
+                
+                return $transient;
+            });
+        }
+    }
+}
+add_action('admin_init', 'fwembed_check_for_updates');
+
+// Add admin notice for debugging
+add_action('admin_notices', function() {
+    if (current_user_can('manage_options')) {
+        $debug = get_option('fwembed_update_debug', []);
+        echo '<div class="notice notice-info is-dismissible"><p>Update Debug: Current: ' . 
+             esc_html($debug['current_version'] ?? 'N/A') . ', Latest: ' . 
+             esc_html($debug['latest_version'] ?? 'N/A') . '</p>';
+             
+        // Detailed debug info with query param
+        if (isset($_GET['fwembed_debug'])) {
+            echo '<pre>' . esc_html(print_r($debug, true)) . '</pre>';
+        }
+        
+        echo '</div>';
+    }
+});
+
+
+// Add plugin information for the details popup/changelog
+add_filter('plugins_api', function($result, $action, $args) {
+    // Only handle requests for our plugin
+    $plugin_slug = 'fourthwall-store-embed'; // The slug is directory name
+    
+    if ($action !== 'plugin_information' || !isset($args->slug) || $args->slug !== $plugin_slug) {
+        return $result;
+    }
+    
+    // Get latest release info from Gitea API
+    $gitea_api_url = 'https://repo.anhonesthost.net/api/v1/repos/wp-plugins/fourth-wall-embed-wp/releases/latest';
+    $ch = curl_init();
+    curl_setopt($ch, CURLOPT_URL, $gitea_api_url);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+    curl_setopt($ch, CURLOPT_HTTPHEADER, ['Accept: application/json']);
+    curl_setopt($ch, CURLOPT_USERAGENT, 'WordPress/Fourth-Wall-Plugin-Updater');
+    curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+    curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+    
+    $response = curl_exec($ch);
+    curl_close($ch);
+    
+    if (!$response) {
+        return $result; // Keep default result if API call fails
+    }
+    
+    $release_info = json_decode($response);
+    
+    // Build plugin info object
+    $plugin_info = new stdClass();
+    $plugin_info->name = 'Fourthwall Store Embed';
+    $plugin_info->slug = $plugin_slug;
+    $plugin_info->version = $release_info->tag_name;
+    $plugin_info->author = '<a href="https://cybercove.io/">Joshua Knapp</a>';
+    $plugin_info->homepage = 'https://repo.anhonesthost.net/wp-plugins/fourth-wall-embed-wp';
+    $plugin_info->requires = '5.0';
+    $plugin_info->tested = '6.8';
+    $plugin_info->downloaded = 10;
+    $plugin_info->last_updated = $release_info->published_at;
+    
+    // Format the release notes
+    $changelog = !empty($release_info->body) ? $release_info->body : 'No changelog provided for this release.';
+    
+    // Handle empty changelog
+    if (empty(trim($changelog))) {
+        $changelog = "Version " . $release_info->tag_name . "\n\n" . 
+                    "Released on " . date('F j, Y', strtotime($release_info->published_at)) . "\n\n" .
+                    "* Updated plugin files";
+    }
+    
+    // Format sections for display
+    $plugin_info->sections = [
+        'description' => '<p>Embed Fourthwall Store in WordPress.</p>',
+        'changelog' => '<pre>' . esc_html($changelog) . '</pre>',
+        'installation' => '<p>Upload the plugin to your WordPress site and activate it.</p>'
+    ];
+    
+    // Download link
+    $download_url = null;
+    if (isset($release_info->assets) && is_array($release_info->assets)) {
+        foreach ($release_info->assets as $asset) {
+            if (isset($asset->name) && strpos($asset->name, '.zip') !== false) {
+                $download_url = $asset->browser_download_url;
+                break;
+            }
+        }
+    }
+    $plugin_info->download_link = $download_url;
+    
+    return $plugin_info;
+}, 10, 3);

libs/settings.php

@@ -64,6 +64,7 @@ class fourthwall_settings {
 		submit_button();
 
 		echo '	</form>' . "\n";
+		echo ' <div><p>To use the fourthwall Embed, use the shortcode [fourthwall]</p></div>';
 		echo '</div>' . "\n";
 
 	}

libs/shortcode.php

@@ -1,18 +1,60 @@
 <?php
 
 function fwembed_parse_html($url = null) {
-  if ($url === null) {
+    if ($url === null) {
     throw new ValueError("Missing URL");
   }
+
+
+  $ch = curl_init();
+
+  // More complete browser-like headers
+  $headers = [
+    'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',
+    'Accept-Language: en-US,en;q=0.5',
+    'Connection: keep-alive',
+    'Upgrade-Insecure-Requests: 1',
+    'Cache-Control: max-age=0'
+  ];
+
+  curl_setopt($ch, CURLOPT_URL, $url);
+  curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+  curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+  curl_setopt($ch, CURLOPT_ENCODING, "");
+  curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+  curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/115.0');
+  curl_setopt($ch, CURLOPT_TIMEOUT, 30);
+  curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); // Only if necessary for testing
+  curl_setopt($ch, CURLOPT_COOKIEJAR, '/tmp/cookies.txt'); // Store cookies
+  curl_setopt($ch, CURLOPT_COOKIEFILE, '/tmp/cookies.txt'); // Use cookies
+
+  $html_content = curl_exec($ch);
+
+  if (curl_errno($ch)) {
+    $error = curl_error($ch);
+    curl_close($ch);
+    return "Error fetching URL: " . $error;
+  }
+
+  $status_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+  if ($status_code == 403) {
+    curl_close($ch);
+    return "Access forbidden (403). The website may be blocking automated requests.";
+  }
+
+  curl_close($ch);
+
   $html = null;
+  libxml_use_internal_errors(true);
   $dom = new DOMDocument();
-  @$dom->loadHTML(file_get_contents($url));
+  @$dom->loadHTML(loadHTML5($html_content), LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD);
   $dom->documentURI = $url;
   $divs = $dom->getElementsByTagName('div');
   foreach ($divs as $div) {
     if ($div->hasAttribute('data-testid') && $div->getAttribute('data-testid') === 'product') {
       $xpath = new DOMXPath($dom);
 
+      $tileLink = $xpath->query('.//a[contains(@class, "tile")]', $div);
       $tileItem = $xpath->query('.//img[contains(@class, "tile__item--1")
                                 and not(contains(@class, "badge"))
                                 and not(contains(@class, "tile_options"))
@@ -20,36 +62,39 @@ function fwembed_parse_html($url = null) {
       $tileDesc = $xpath->query('.//*[contains(@class, "tile__description")
                                 and not(contains(@class, "badge"))
                                 and not(contains(@class, "tile_options"))]', $div);
-      $tileHeading = $xpath->query('.//*[contains(@class, "tile__heading") 
-                                   and not(contains(@class, "badge")) 
-                                   and not(contains(@class, "tile_options"))]', $div);
       $tilePrices = $xpath->query('.//*[contains(@class, "tile__prices")
                                   and not(contains(@class, "badge"))
-                                  and not(contains(@class, "tile_options"))]', $div);
+                                  and not(contains(@class, "tile_options"))
+                                  and not(contains(@class, "tile__price tile__price--original"))]', $div);
       $productHTML = '';
+      $linkHref = '';
+      if ($tileLink->length > 0) {
+        $linkHref = $tileLink->item(0)->getAttribute('href');
+      }
       if ($tileItem->length > 0) {
         $productHTML .= $dom->saveHTML($tileItem->item(0));
       }
       if ($tileDesc->length > 0) {
         $productHTML .= $dom->saveHTML($tileDesc->item(0));
       }
-      if ($tileHeading->length > 0) {
+      //if ($tilePrices->length > 0) {
-        $productHTML .= $dom->saveHTML($tileHeading->item(0));
+      //  $productHTML .= $dom->saveHTML($tilePrices->item(0));
-      }
+     // }
-      if ($tilePrices->length > 0) {
-        $productHTML .= $dom->saveHTML($tilePrices->item(0));
-      }
 
-      $html = $html . '<div class="product-tile">' . $productHTML . '</div>';
+      $html = $html . '<div class="product-tile"><a class="product-link" target="_blank" href="' . $url . $linkHref . '">' . $productHTML . '</a></div>';
     }
   }
-  $html = str_replace('a href="', 'a target="_blank" href="' . $url, $html);
+  libxml_clear_errors();
   return $html;
 }
 
+function loadHTML5($html) {
+  return '<!DOCTYPE html><html><body>' . $html . '</body></html>';
+}
+
 function fwembed_shortcode( $atts ) {
   $options = get_option( 'fourthwall_settings_name' );
-  $value = isset( $options['fourth_url'] ) ? $options['fourth_url'] : 'https://latinosagainstspookyshit-shop.fourthwall.com';
+  $value = isset( $options['fourth_url'] ) ? $options['fourth_url'] : 'https://fourthwall.com';
   $store_html = fwembed_parse_html($value);
   $store_render = '<div class="fw-store-parent">' . PHP_EOL . $store_html . PHP_EOL . '</div>';
   return $store_render;