Merge pull request 'Update for FW switching to sending Binary instead of raw html' (#3) from Fix-fw-binary into main

Reviewed-on: #3

.gitea/workflows/release.yml

@@ -0,0 +1,38 @@
+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 }}
+
+      - 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
+
+      - 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 }}
+          files: |
+            fourthwall-store-embed.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;
+}

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

@@ -4,15 +4,57 @@ function fwembed_parse_html($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;