more name changes
Some checks failed
PHP Code Checker / PHP Code Checker (pull_request) Successful in 52s
PHPUnit / PHPUnit – PHP 7.4 (pull_request) Failing after 1m8s
PHPUnit / PHPUnit – PHP 8.0 (pull_request) Failing after 1m4s
PHPUnit / PHPUnit – PHP 8.1 (pull_request) Failing after 1m8s
PHPUnit / PHPUnit – PHP 8.2 (pull_request) Failing after 1m11s
PHPUnit / PHPUnit – PHP 8.3 (pull_request) Failing after 1m5s
PHPUnit / PHPUnit – PHP 8.4 (pull_request) Failing after 1m3s

This commit is contained in:
André Menrath 2024-12-06 16:51:54 +01:00
parent 6499d32d0e
commit 4140d36a1d
7 changed files with 20 additions and 19 deletions

View file

@ -77,7 +77,7 @@ jobs:
- name: Run General Tests - name: Run General Tests
run: cd /workspace/Event-Federation/wordpress-activitypub-event-bridge/ && ./vendor/bin/phpunit --filter=event_bridge_for_activitypub run: cd /workspace/Event-Federation/wordpress-event-bridge-for-activitypub/ && ./vendor/bin/phpunit --filter=event_bridge_for_activitypub
env: env:
PHP_VERSION: ${{ matrix.php-version }} PHP_VERSION: ${{ matrix.php-version }}

View file

@ -14,19 +14,20 @@ jQuery( function( $ ) {
// Function to toggle visibility of custom details based on selected radio button. // Function to toggle visibility of custom details based on selected radio button.
function toggleCustomDetailsForSummary() { function toggleCustomDetailsForSummary() {
if ($("#activitypub_summary_type_custom").is(':checked')) { if ($("#event_bridge_activitypub_summary_type_custom").is(':checked')) {
$("#activitypub_summary_type_custom-details").show(); $("#event_bridge_activitypub_summary_type_custom-details").show();
} else { } else {
$("#activitypub_summary_type_custom-details").hide(); $("#event_bridge_activitypub_summary_type_custom-details").hide();
} }
} }
// Run the toggle function on page load. // Run the toggle function on page load.
$(document).ready(function() { $(document).ready(function() {
window.console.log("test");
toggleCustomDetailsForSummary(); // Set the correct state on load. toggleCustomDetailsForSummary(); // Set the correct state on load.
// Listen for changes on the radio buttons // Listen for changes on the radio buttons
$("input[name=activitypub_summary_type]").change(function() { $("input[name=event_bridge_activitypub_summary_type]").change(function() {
toggleCustomDetailsForSummary(); // Update visibility on change. toggleCustomDetailsForSummary(); // Update visibility on change.
}); });
}); });

View file

@ -60,7 +60,7 @@
], ],
"test-debug": [ "test-debug": [
"@prepare-test", "@prepare-test",
"@test-activitypub-event-bridge-shortcodes" "@test-event-bridge-for-activitypub-shortcodes"
], ],
"test-vs-event-list": "phpunit --filter=vs_event_list", "test-vs-event-list": "phpunit --filter=vs_event_list",
"test-the-events-calendar": "phpunit --filter=the_events_calendar", "test-the-events-calendar": "phpunit --filter=the_events_calendar",
@ -71,7 +71,7 @@
"test-modern-events-calendar-lite": "phpunit --filter=modern_events_calendar_lite", "test-modern-events-calendar-lite": "phpunit --filter=modern_events_calendar_lite",
"test-eventprime": "phpunit --filter=eventprime", "test-eventprime": "phpunit --filter=eventprime",
"test-event-organiser": "phpunit --filter=event_organiser", "test-event-organiser": "phpunit --filter=event_organiser",
"test-activitypub-event-bridge-shortcodes": "phpunit --filter=event_bridge_for_activitypub_shortcodes", "test-event-bridge-for-activitypub-shortcodes": "phpunit --filter=event_bridge_for_activitypub_shortcodes",
"test-all": "phpunit" "test-all": "phpunit"
} }
} }

View file

@ -3,7 +3,7 @@
* Plugin Name: Event Bridge for ActivityPub * Plugin Name: Event Bridge for ActivityPub
* Description: Integrating popular event plugins with the ActivityPub plugin. * Description: Integrating popular event plugins with the ActivityPub plugin.
* Plugin URI: https://event-federation.eu/ * Plugin URI: https://event-federation.eu/
* Version: 0.3.1 * Version: 0.3.1.1
* Author: André Menrath * Author: André Menrath
* Author URI: https://graz.social/@linos * Author URI: https://graz.social/@linos
* Text Domain: event-bridge-for-activitypub * Text Domain: event-bridge-for-activitypub

View file

@ -419,7 +419,7 @@ abstract class Event extends Post {
* Get the summary. * Get the summary.
*/ */
public function get_summary(): ?string { public function get_summary(): ?string {
if ( 'preset' === get_option( 'activitypub_summary_type', 'preset' ) ) { if ( 'preset' === get_option( 'event_bridge_for_activitypub_summary_type', 'preset' ) ) {
return $this->format_preset_summary(); return $this->format_preset_summary();
} }

View file

@ -73,22 +73,22 @@ class Settings {
); );
\register_setting( \register_setting(
'activitypub-event-bridge', 'event-bridge-for-activitypub',
'activitypub_summary_type', 'event_bridge_activitypub_summary_type',
array( array(
'type' => 'string', 'type' => 'string',
'description' => \__( 'Summary type to use for ActivityStreams', 'activitypub-event-bridge' ), 'description' => \__( 'Summary type to use for ActivityStreams', 'event-bridge-for-activitypub' ),
'show_in_rest' => true, 'show_in_rest' => true,
'default' => 'preset', 'default' => 'preset',
) )
); );
\register_setting( \register_setting(
'activitypub-event-bridge', 'event-bridge-for-activitypub',
'event_bridge_for_activitypub_custom_summary', 'event_bridge_for_activitypub_custom_summary',
array( array(
'type' => 'string', 'type' => 'string',
'description' => \__( 'Define your own custom summary template for events', 'activitypub-event-bridge' ), 'description' => \__( 'Define your own custom summary template for events', 'event-bridge-for-activitypub' ),
'show_in_rest' => true, 'show_in_rest' => true,
'default' => EVENT_BRIDGE_FOR_ACTIVITYPUB_CUSTOM_SUMMARY, 'default' => EVENT_BRIDGE_FOR_ACTIVITYPUB_CUSTOM_SUMMARY,
) )

View file

@ -46,8 +46,8 @@ $current_category_mapping = \get_option( 'event_bridge_for_activitypub_ev
<h2> <?php esc_html_e( 'Event Summary Text', 'event-bridge-for-activitypub' ); ?> </h2> <h2> <?php esc_html_e( 'Event Summary Text', 'event-bridge-for-activitypub' ); ?> </h2>
<p><?php esc_html_e( 'Many Fediverse applications (e.g., Mastodon) don\'t fully support events, instead they will show a summary text along with the events title and the URL to your Website.', 'event-bridge-for-activitypub' ); ?></p> <p><?php esc_html_e( 'Many Fediverse applications (e.g., Mastodon) don\'t fully support events, instead they will show a summary text along with the events title and the URL to your Website.', 'event-bridge-for-activitypub' ); ?></p>
<p> <p>
<label for="activitypub_summary_type_preset"> <label for="event_bridge_activitypub_summary_type_preset">
<input type="radio" name="activitypub_summary_type" id="activitypub_summary_type_preset" value="preset" <?php echo \checked( 'preset', \get_option( 'activitypub_summary_type', EVENT_BRIDGE_FOR_ACTIVITYPUB_DEFAULT_SUMMARY_TYPE ) ); ?> /> <input type="radio" name="event_bridge_activitypub_summary_type" id="event_bridge_activitypub_summary_type_preset" value="preset" <?php echo \checked( 'preset', \get_option( 'event_bridge_for_activitypub_summary_type', EVENT_BRIDGE_FOR_ACTIVITYPUB_DEFAULT_SUMMARY_TYPE ) ); ?> />
<?php \esc_html_e( 'Automatic (default)', 'activitypub' ); ?> <?php \esc_html_e( 'Automatic (default)', 'activitypub' ); ?>
- -
<span class="description"> <span class="description">
@ -56,8 +56,8 @@ $current_category_mapping = \get_option( 'event_bridge_for_activitypub_ev
</label> </label>
</p> </p>
<p> <p>
<label for="activitypub_summary_type_custom"> <label for="event_bridge_activitypub_summary_type_custom">
<input type="radio" name="activitypub_summary_type" id="activitypub_summary_type_custom" value="custom" <?php echo \checked( 'custom', \get_option( 'activitypub_summary_type', EVENT_BRIDGE_FOR_ACTIVITYPUB_DEFAULT_SUMMARY_TYPE ) ); ?> /> <input type="radio" name="event_bridge_activitypub_summary_type" id="event_bridge_activitypub_summary_type_custom" value="custom" <?php echo \checked( 'custom', \get_option( 'event_bridge_for_activitypub_summary_type', EVENT_BRIDGE_FOR_ACTIVITYPUB_DEFAULT_SUMMARY_TYPE ) ); ?> />
<?php \esc_html_e( 'Custom', 'event-bridge-for-activitypub' ); ?> <?php \esc_html_e( 'Custom', 'event-bridge-for-activitypub' ); ?>
- -
<span class="description"> <span class="description">
@ -65,7 +65,7 @@ $current_category_mapping = \get_option( 'event_bridge_for_activitypub_ev
</span> </span>
</label> </label>
</p> </p>
<div id="activitypub_summary_type_custom-details"> <div id="event_bridge_activitypub_summary_type_custom-details">
<textarea name="event_bridge_for_activitypub_custom_summary" id="event_bridge_for_activitypub_custom_summary" rows="10" cols="50" class="large-text" placeholder="<?php echo wp_kses( EVENT_BRIDGE_FOR_ACTIVITYPUB_CUSTOM_SUMMARY, 'post' ); ?>"><?php echo esc_textarea( wp_kses( \get_option( 'event_bridge_for_activitypub_custom_summary', EVENT_BRIDGE_FOR_ACTIVITYPUB_CUSTOM_SUMMARY ), 'post' ) ); ?></textarea> <textarea name="event_bridge_for_activitypub_custom_summary" id="event_bridge_for_activitypub_custom_summary" rows="10" cols="50" class="large-text" placeholder="<?php echo wp_kses( EVENT_BRIDGE_FOR_ACTIVITYPUB_CUSTOM_SUMMARY, 'post' ); ?>"><?php echo esc_textarea( wp_kses( \get_option( 'event_bridge_for_activitypub_custom_summary', EVENT_BRIDGE_FOR_ACTIVITYPUB_CUSTOM_SUMMARY ), 'post' ) ); ?></textarea>
<details> <details>
<summary><?php esc_html_e( 'See a list Template Tags available for the summary.', 'activitypub' ); ?></summary> <summary><?php esc_html_e( 'See a list Template Tags available for the summary.', 'activitypub' ); ?></summary>