Compare commits

..

No commits in common. "main" and "2025.01.08-2139" have entirely different histories.

7 changed files with 7 additions and 328 deletions

View File

@ -14,7 +14,6 @@ jobs:
with: with:
username: ${{ secrets.CI_USER }} username: ${{ secrets.CI_USER }}
password: ${{ secrets.CI_TOKEN }} password: ${{ secrets.CI_TOKEN }}
fetch-depth: 0 # Important: Fetch all history for commit messages
- name: Get version - name: Get version
id: get_version id: get_version
@ -25,42 +24,6 @@ jobs:
echo "version=$(date +'%Y.%m.%d-%H%M')" >> $GITHUB_OUTPUT echo "version=$(date +'%Y.%m.%d-%H%M')" >> $GITHUB_OUTPUT
fi 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 - name: Create ZIP archive
run: | run: |
zip -r fourthwall-store-embed.zip . -x ".git/*" ".gitea/*" zip -r fourthwall-store-embed.zip . -x ".git/*" ".gitea/*"
@ -71,6 +34,5 @@ jobs:
token: "${{ secrets.REPO_TOKEN }}" token: "${{ secrets.REPO_TOKEN }}"
title: Fourthwall-store-embed Release ${{ steps.get_version.outputs.version }} title: Fourthwall-store-embed Release ${{ steps.get_version.outputs.version }}
tag_name: ${{ steps.get_version.outputs.version }} tag_name: ${{ steps.get_version.outputs.version }}
body: "${{ steps.release_notes.outputs.notes }}"
files: | files: |
fourthwall-store-embed.zip fourthwall-store-embed.zip

View File

@ -1,49 +0,0 @@
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

View File

@ -1,12 +1,3 @@
# fourth-wall-embed-wp # 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.

View File

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

View File

@ -1,177 +0,0 @@
<?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);
// 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.8',
'requires' => '6.2',
'compatibility' => new stdClass(),
];
return $transient;
});
}
}
}
add_action('admin_init', 'fwembed_check_for_updates');
// 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);

View File

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

View File

@ -1,53 +1,12 @@
<?php <?php
function fwembed_parse_html($url = null) { function fwembed_parse_html($url = null) {
if ($url === null) { if ($url === null) {
throw new ValueError("Missing URL"); 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; $html = null;
libxml_use_internal_errors(true);
$dom = new DOMDocument(); $dom = new DOMDocument();
@$dom->loadHTML(loadHTML5($html_content), LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD); @$dom->loadHTML(file_get_contents($url));
$dom->documentURI = $url; $dom->documentURI = $url;
$divs = $dom->getElementsByTagName('div'); $divs = $dom->getElementsByTagName('div');
foreach ($divs as $div) { foreach ($divs as $div) {
@ -84,19 +43,14 @@ function fwembed_parse_html($url = null) {
$html = $html . '<div class="product-tile"><a class="product-link" target="_blank" href="' . $url . $linkHref . '">' . $productHTML . '</a></div>'; $html = $html . '<div class="product-tile"><a class="product-link" target="_blank" href="' . $url . $linkHref . '">' . $productHTML . '</a></div>';
} }
} }
libxml_clear_errors();
return $html; return $html;
} }
function loadHTML5($html) {
return '<!DOCTYPE html><html><body>' . $html . '</body></html>';
}
function fwembed_shortcode( $atts ) { function fwembed_shortcode( $atts ) {
$options = get_option( 'fourthwall_settings_name' ); $options = get_option( 'fourthwall_settings_name' );
$value = isset( $options['fourth_url'] ) ? $options['fourth_url'] : 'https://fourthwall.com'; $value = isset( $options['fourth_url'] ) ? $options['fourth_url'] : 'https://latinosagainstspookyshit-shop.fourthwall.com';
$store_html = fwembed_parse_html($value); $store_html = fwembed_parse_html($value);
$store_render = '<div class="fw-store-parent">' . PHP_EOL . $store_html . PHP_EOL . '</div>'; $store_render = '<div class="fw-store-parent">' . PHP_EOL . $store_html . PHP_EOL . '</div>';
return $store_render; return $store_render;
} }
add_shortcode( 'fourthwall', 'fwembed_shortcode' ); add_shortcode( 'fourthwall', 'fwembed_shortcode' );