From 53cdbd3838131cbb47d6e140ee18b38a50523946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Sat, 16 Nov 2024 19:38:28 +0100 Subject: [PATCH 1/9] =?UTF-8?q?Fix=20issues=20for=20WordPress.org=20releas?= =?UTF-8?q?e=20(#77)=20Co-authored-by:=20Andr=C3=A9=20Menrath=20=20Co-committed-by:=20Andr=C3=A9=20Menrath=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .forgejo/workflows/phpunit.yml | 7 ++++--- README.md | 5 +++-- activitypub-event-bridge.php | 4 ++-- bin/install-wp-tests.sh | 20 ++++++++++++------- .../class-modern-events-calendar-lite.php | 2 +- readme.txt | 5 +++-- templates/admin-header.php | 3 +++ 7 files changed, 29 insertions(+), 17 deletions(-) diff --git a/.forgejo/workflows/phpunit.yml b/.forgejo/workflows/phpunit.yml index 3e6d9f7..f8e08ac 100644 --- a/.forgejo/workflows/phpunit.yml +++ b/.forgejo/workflows/phpunit.yml @@ -22,6 +22,7 @@ jobs: strategy: matrix: php-version: ['7.4', '8.0', '8.1', '8.2', '8.3'] + wordpress-version: ['6.7'] name: PHPUnit – PHP ${{ matrix.php-version }} env: extensions: mysql @@ -37,7 +38,7 @@ jobs: path: | ${{ env.WP_CORE_DIR }} ${{ env.WP_TESTS_DIR }} - key: cache-wordpress-9 + key: cache-wordpress-67-2 - name: Cache Composer id: cache-composer-phpunit @@ -68,11 +69,11 @@ jobs: - name: Setup Test Environment if: steps.cache-wordpress.outputs.cache-hit != 'true' - run: bash bin/install-wp-tests.sh wordpress_test root root 127.0.0.1 6.6 false false false false + run: bash bin/install-wp-tests.sh wordpress_test root root 127.0.0.1 ${{ matrix.wordpress-version }} false false false false - name: Initialize WordPress test database if: steps.cache-wordpress.outputs.cache-hit != 'false' - run: bash bin/install-wp-tests.sh wordpress_test root root 127.0.0.1 6.6 false true true true + run: bash bin/install-wp-tests.sh wordpress_test root root 127.0.0.1 ${{ matrix.wordpress-version }} false true true true - name: Run Integration tests for The Events Calendar run: cd /workspace/Event-Federation/wordpress-activitypub-event-bridge/ && ./vendor/bin/phpunit --filter=the_events_calendar diff --git a/README.md b/README.md index 2a8553d..c546212 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ **Contributors:** [andremenrath](https://profiles.wordpress.org/andremenrath/) **Tags:** events, fediverse, activitypub, calendar **Requires at least:** 6.5 -**Tested up to:** 6.6 -**Stable tag:** 0.2.0 +**Tested up to:** 6.7 +**Stable tag:** 0.2.1 **Requires PHP:** 7.4 **License:** AGPL-3.0-or-later **License URI:** https://www.gnu.org/licenses/agpl-3.0.html @@ -73,6 +73,7 @@ If you're new to the [ActivityPub plugin](https://wordpress.org/plugins/activity ### Do I need to install another event plugin to use the Event Federation Plugin? ### Yes, this plugin works as an add-on and requires both the ActivityPub plugin and a supported event plugin such as The Events Calendar, VS Event List, or Events Manager to manage your events. It just fills the missing gap between event plugins and the [ActivityPub plugin](https://wordpress.org/plugins/activitypub/). + ### What platforms can follow my events? ### Your events can be followed on platforms that support ActivityPub like [Mobilizon](https://joinmobilizon.org/), [Gancio](https://gancio.org), [Friendica](https://friendi.ca), [Hubzilla](https://hubzilla.org), and [Pleroma](https://pleroma.social/). Even other applications like [Mastodon](https://joinmastodon.org), which don't fully support events yet, will display all important information about the events. diff --git a/activitypub-event-bridge.php b/activitypub-event-bridge.php index 4278457..961af39 100644 --- a/activitypub-event-bridge.php +++ b/activitypub-event-bridge.php @@ -3,7 +3,7 @@ * Plugin Name: ActivityPub Event Bridge * Description: Integrating popular event plugins with the ActivityPub plugin. * Plugin URI: https://event-federation.eu/ - * Version: 0.2.0 + * Version: 0.2.1 * Author: André Menrath * Author URI: https://graz.social/@linos * Text Domain: activitypub-event-bridge @@ -11,7 +11,7 @@ * License URI: https://www.gnu.org/licenses/agpl-3.0.html * Requires PHP: 7.4 * - * Requires at least ActivityPub plugin with version >= 3.2.2. ActivityPub plugin tested up to: 4.0.1. + * Requires at least ActivityPub plugin with version >= 3.2.2. ActivityPub plugin tested up to: 4.2.0. * * @package ActivityPub_Event_Bridge * @license AGPL-3.0-or-later diff --git a/bin/install-wp-tests.sh b/bin/install-wp-tests.sh index f0bf333..3cc440f 100755 --- a/bin/install-wp-tests.sh +++ b/bin/install-wp-tests.sh @@ -208,9 +208,15 @@ install_wp_plugin() { fi # Get the latest tag. - LATEST_TAG=$(svn log https://plugins.svn.wordpress.org/$PLUGIN_NAME/tags --limit 1 | awk 'NR == 4 { print $4 }') - if [ -n "$LATEST_TAG" ]; then - PLUGIN_FILE="$PLUGIN_NAME.$LATEST_TAG.zip" + if [ -z "$2" ]; then + LATEST_TAG=$(svn log https://plugins.svn.wordpress.org/$PLUGIN_NAME/tags --limit 1 | awk 'NR == 4 { print $4 }') + PLUGIN_VERSION=$LATEST_TAG + else + PLUGIN_VERSION=$2 + fi + + if [ -n "$PLUGIN_VERSION" ]; then + PLUGIN_FILE="$PLUGIN_NAME.$PLUGIN_VERSION.zip" else PLUGIN_FILE="$PLUGIN_NAME.zip" fi @@ -248,12 +254,12 @@ install_wp_plugins() { # Install the one and only ActivityPub plugin (greetings @pfefferle). install_wp_plugin activitypub # Install (not-activate) all supported event plugins. - install_wp_plugin the-events-calendar + install_wp_plugin the-events-calendar "6.8.1" install_wp_plugin very-simple-event-list install_wp_plugin gatherpress - install_wp_plugin events-manager - install_wp_plugin wp-event-manager - install_wp_plugin wp-event-solution + install_wp_plugin events-manager "6.6.3" + install_wp_plugin wp-event-manager "3.1.45.1" + install_wp_plugin wp-event-solution "4.0.14" # Mec is not installable via wordpress.org, we use our own mirror. install_wp_plugin_mec } diff --git a/includes/plugins/class-modern-events-calendar-lite.php b/includes/plugins/class-modern-events-calendar-lite.php index 796634d..45f060f 100644 --- a/includes/plugins/class-modern-events-calendar-lite.php +++ b/includes/plugins/class-modern-events-calendar-lite.php @@ -38,7 +38,7 @@ final class Modern_Events_Calendar_Lite extends Event_plugin { */ public static function get_post_type(): string { // See MEC_feature_events->get_main_post_type(). - return apply_filters( 'mec_post_type_name', 'mec-events' ); // phpcs:ignore + return 'mec-events'; } /** diff --git a/readme.txt b/readme.txt index df031ea..caedf64 100644 --- a/readme.txt +++ b/readme.txt @@ -2,8 +2,8 @@ Contributors: andremenrath Tags: events, fediverse, activitypub, calendar Requires at least: 6.5 -Tested up to: 6.6 -Stable tag: 0.2.0 +Tested up to: 6.7 +Stable tag: 0.2.1 Requires PHP: 7.4 License: AGPL-3.0-or-later License URI: https://www.gnu.org/licenses/agpl-3.0.html @@ -67,6 +67,7 @@ If you're new to the [ActivityPub plugin](https://wordpress.org/plugins/activity = Do I need to install another event plugin to use the Event Federation Plugin? = Yes, this plugin works as an add-on and requires both the ActivityPub plugin and a supported event plugin such as The Events Calendar, VS Event List, or Events Manager to manage your events. It just fills the missing gap between event plugins and the [ActivityPub plugin](https://wordpress.org/plugins/activitypub/). + = What platforms can follow my events? = Your events can be followed on platforms that support ActivityPub like [Mobilizon](https://joinmobilizon.org/), [Gancio](https://gancio.org), [Friendica](https://friendi.ca), [Hubzilla](https://hubzilla.org), and [Pleroma](https://pleroma.social/). Even other applications like [Mastodon](https://joinmastodon.org), which don't fully support events yet, will display all important information about the events. diff --git a/templates/admin-header.php b/templates/admin-header.php index efc02bc..4ee283b 100644 --- a/templates/admin-header.php +++ b/templates/admin-header.php @@ -5,6 +5,9 @@ * @package ActivityPub_Event_Bridge */ +// Exit if accessed directly. +defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore + /* @var array $args Template arguments. */ $args = wp_parse_args( $args, From 9e518235953faa22a21a79260cd124fcb4eafa02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Sun, 17 Nov 2024 08:45:06 +0100 Subject: [PATCH 2/9] Update Changelog --- CHANGELOG.md | 14 ++++++++++++-- README.md | 6 +++++- readme.txt | 6 +++++- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a605a7..b1f6405 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,18 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [0.1.0] - 2024-10-20 +## [0.2.1] - 2024-11-16 ### Added -* Initial version tag. +* Initial release on WordPress.org + +### Fixed + +* Applied some WordPress best practices + +## [0.2.0] - 2024-10-20 + +### Added + +* Initial submission to WordPress.org diff --git a/README.md b/README.md index c546212..023e5c2 100644 --- a/README.md +++ b/README.md @@ -100,6 +100,10 @@ We're always interested in your feedback. Feel free to reach out to us via [E-Ma ## Changelog ## -### [0.2.0] 2024-10-29 ### +### [0.2.1] 2024-11-16 ### * Initial release on https://wordpress.org/ + +### [0.2.0] 2024-10-29 ### + +* Initial submission to https://wordpress.org/ diff --git a/readme.txt b/readme.txt index caedf64..66ef1b9 100644 --- a/readme.txt +++ b/readme.txt @@ -94,6 +94,10 @@ We're always interested in your feedback. Feel free to reach out to us via [E-Ma == Changelog == -= [0.2.0] 2024-10-29 = += [0.2.1] 2024-11-16 = * Initial release on https://wordpress.org/ + += [0.2.0] 2024-10-29 = + +* Initial submission to https://wordpress.org/ From 7eb011859adcebe4475a1aee5c66d848d82c58c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Sun, 17 Nov 2024 10:50:45 +0100 Subject: [PATCH 3/9] rename variable in tests bootstrap for consitency --- docs/add_your_event_plugin.md | 2 +- tests/bootstrap.php | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/add_your_event_plugin.md b/docs/add_your_event_plugin.md index 44ec1f4..165f285 100644 --- a/docs/add_your_event_plugin.md +++ b/docs/add_your_event_plugin.md @@ -180,7 +180,7 @@ In the pipeline we want to run each event plugins integration tests in a single To activate/load your plugin add it to the switch statement within the function `_manually_load_plugin()` within `tests/bootstrap.php`. ```php - switch ( $activitypub_event_extension_integration_filter ) { + switch ( $activitypub_event_bridge_integration_filter ) { ... case 'my_event_plugin': $plugin_file = 'my-event-plugin/my-event-plugin.php'; diff --git a/tests/bootstrap.php b/tests/bootstrap.php index df5b41e..4262f2b 100755 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -35,10 +35,10 @@ function _manually_load_plugin() { require_once $plugin_dir . 'activitypub/activitypub.php'; // Capture the --filter argument. - $activitypub_event_extension_integration_filter = null; + $activitypub_event_bridge_integration_filter = null; foreach ( $_SERVER['argv'] as $arg ) { if ( strpos( $arg, '--filter=' ) === 0 ) { - $activitypub_event_extension_integration_filter = substr( $arg, strlen( '--filter=' ) ); + $activitypub_event_bridge_integration_filter = substr( $arg, strlen( '--filter=' ) ); break; } } @@ -49,7 +49,7 @@ function _manually_load_plugin() { $plugin_file = null; // See if we want to run integration tests for a specific event-plugin. - switch ( $activitypub_event_extension_integration_filter ) { + switch ( $activitypub_event_bridge_integration_filter ) { case 'the_events_calendar': $plugin_file = 'the-events-calendar/the-events-calendar.php'; break; @@ -84,14 +84,14 @@ function _manually_load_plugin() { } // Hot fix that allows using Events Manager within unit tests, because the em_init() is later not run as admin. - if ( 'events_manager' === $activitypub_event_extension_integration_filter ) { + if ( 'events_manager' === $activitypub_event_bridge_integration_filter ) { require_once $plugin_dir . 'events-manager/em-install.php'; em_create_events_table(); em_create_events_meta_table(); em_create_locations_table(); } - if ( 'modern_events_calendar_lite' === $activitypub_event_extension_integration_filter ) { + if ( 'modern_events_calendar_lite' === $activitypub_event_bridge_integration_filter ) { require_once $plugin_dir . 'modern-events-calendar-lite/app/libraries/factory.php'; $mec_factory = new MEC_factory(); $mec_factory->install(); From dddd3e395f6f878b0f0d2ce19d1096afed6e4c70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Sun, 24 Nov 2024 10:19:46 +0100 Subject: [PATCH 4/9] Fix: hook for ActivityPub transformer might also return null (#81) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-on: https://code.event-federation.eu/Event-Federation/wordpress-activitypub-event-bridge/pulls/81 Co-authored-by: André Menrath Co-committed-by: André Menrath --- CHANGELOG.md | 6 ++++++ README.md | 6 ++++++ includes/class-setup.php | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1f6405..7a9a38f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## Unreleased + +### Fixed + +* Fixed that transformer hook function might also return `null`. + ## [0.2.1] - 2024-11-16 ### Added diff --git a/README.md b/README.md index 023e5c2..2e12c7a 100644 --- a/README.md +++ b/README.md @@ -100,6 +100,12 @@ We're always interested in your feedback. Feel free to reach out to us via [E-Ma ## Changelog ## +## Unreleased + +### Fixed + +* Fixed that transformer hook function might also return `null`. + ### [0.2.1] 2024-11-16 ### * Initial release on https://wordpress.org/ diff --git a/includes/class-setup.php b/includes/class-setup.php index 2912002..7d1ddb5 100644 --- a/includes/class-setup.php +++ b/includes/class-setup.php @@ -252,7 +252,7 @@ class Setup { * * @return \Activitypub\Transformer\Base|null */ - public function register_activitypub_event_transformer( $transformer, $wp_object, $object_class ): \Activitypub\Transformer\Base { + public function register_activitypub_event_transformer( $transformer, $wp_object, $object_class ): ?\Activitypub\Transformer\Base { // If the current WordPress object is not a post (e.g., a WP_Comment), don't change the transformer. if ( 'WP_Post' !== $object_class ) { return $transformer; From d625750a7e2e8385f4b91372eb341acff20ae740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Thu, 28 Nov 2024 19:01:28 +0100 Subject: [PATCH 5/9] Add Event plugin integration: EventPrime (#82) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-on: https://code.event-federation.eu/Event-Federation/wordpress-activitypub-event-bridge/pulls/82 Co-authored-by: André Menrath Co-committed-by: André Menrath --- .forgejo/workflows/phpunit.yml | 7 +- CHANGELOG.md | 4 + README.md | 5 + bin/install-wp-tests.sh | 1 + composer.json | 6 +- .../transformer/class-eventprime.php | 78 +++++++ .../transformer/class-gatherpress.php | 2 +- includes/class-setup.php | 1 + includes/plugins/class-eventprime.php | 218 ++++++++++++++++++ readme.txt | 1 + tests/bootstrap.php | 3 + tests/test-class-plugin-eventprime.php | 186 +++++++++++++++ 12 files changed, 508 insertions(+), 4 deletions(-) create mode 100644 includes/activitypub/transformer/class-eventprime.php create mode 100644 includes/plugins/class-eventprime.php create mode 100644 tests/test-class-plugin-eventprime.php diff --git a/.forgejo/workflows/phpunit.yml b/.forgejo/workflows/phpunit.yml index f8e08ac..c79e189 100644 --- a/.forgejo/workflows/phpunit.yml +++ b/.forgejo/workflows/phpunit.yml @@ -38,7 +38,7 @@ jobs: path: | ${{ env.WP_CORE_DIR }} ${{ env.WP_TESTS_DIR }} - key: cache-wordpress-67-2 + key: cache-wordpress-67-3 - name: Cache Composer id: cache-composer-phpunit @@ -107,5 +107,10 @@ jobs: - name: Run Integration tests for Modern Events Calendar Lite run: cd /workspace/Event-Federation/wordpress-activitypub-event-bridge/ && ./vendor/bin/phpunit --filter=modern_events_calendar_lite + env: + PHP_VERSION: ${{ matrix.php-version }} + + - name: Run Integration tests for EventPrime + run: cd /workspace/Event-Federation/wordpress-activitypub-event-bridge/ && ./vendor/bin/phpunit --filter=eventprime env: PHP_VERSION: ${{ matrix.php-version }} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a9a38f..ce5ffe0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +### Added + +* Integration for EventPrime – Events Calendar, Bookings and Tickets + ### Fixed * Fixed that transformer hook function might also return `null`. diff --git a/README.md b/README.md index 2e12c7a..7e64f0f 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,7 @@ This plugin depends on the [ActivityPub plugin](https://wordpress.org/plugins/ac * [Eventin](https://de.wordpress.org/plugins/wp-event-solution/) * [Modern Events Calendar Lite](https://webnus.net/modern-events-calendar/) * [GatherPress](https://gatherpress.org/) +* [EventPrime – Events Calendar, Bookings and Tickets](https://wordpress.org/plugins/eventprime-event-calendar-management/) ## Configuration ## @@ -102,6 +103,10 @@ We're always interested in your feedback. Feel free to reach out to us via [E-Ma ## Unreleased +### Added + +* Integration for EventPrime – Events Calendar, Bookings and Tickets + ### Fixed * Fixed that transformer hook function might also return `null`. diff --git a/bin/install-wp-tests.sh b/bin/install-wp-tests.sh index 3cc440f..7cbf282 100755 --- a/bin/install-wp-tests.sh +++ b/bin/install-wp-tests.sh @@ -257,6 +257,7 @@ install_wp_plugins() { install_wp_plugin the-events-calendar "6.8.1" install_wp_plugin very-simple-event-list install_wp_plugin gatherpress + install_wp_plugin eventprime-event-calendar-management install_wp_plugin events-manager "6.6.3" install_wp_plugin wp-event-manager "3.1.45.1" install_wp_plugin wp-event-solution "4.0.14" diff --git a/composer.json b/composer.json index 4da8b48..d4c2b0b 100644 --- a/composer.json +++ b/composer.json @@ -54,11 +54,12 @@ "@test-events-manager", "@test-wp-event-manager", "@test-eventin", - "@test-modern-events-calendar-lite" + "@test-modern-events-calendar-lite", + "@test-eventprime" ], "test-debug": [ "@prepare-test", - "@test-gatherpress" + "@test-eventprime" ], "test-vs-event-list": "phpunit --filter=vs_event_list", "test-the-events-calendar": "phpunit --filter=the_events_calendar", @@ -67,6 +68,7 @@ "test-wp-event-manager": "phpunit --filter=wp_event_manager", "test-eventin": "phpunit --filter=eventin", "test-modern-events-calendar-lite": "phpunit --filter=modern_events_calendar_lite", + "test-eventprime": "phpunit --filter=eventprime", "test-all": "phpunit" } } diff --git a/includes/activitypub/transformer/class-eventprime.php b/includes/activitypub/transformer/class-eventprime.php new file mode 100644 index 0000000..c247ebe --- /dev/null +++ b/includes/activitypub/transformer/class-eventprime.php @@ -0,0 +1,78 @@ +wp_object->ID, 'em_end_date', true ); + if ( $timestamp ) { + return \gmdate( 'Y-m-d\TH:i:s\Z', $timestamp ); + } else { + return null; + } + } + + /** + * Get the end time from the event object. + */ + protected function get_start_time(): string { + $timestamp = get_post_meta( $this->wp_object->ID, 'em_start_date', true ); + if ( $timestamp ) { + return \gmdate( 'Y-m-d\TH:i:s\Z', $timestamp ); + } else { + return ''; + } + } + + /** + * Get location from the event object. + */ + protected function get_location(): ?Place { + $venue_term_id = get_post_meta( $this->wp_object->ID, 'em_venue', true ); + if ( ! $venue_term_id ) { + return null; + } + + $venue = wp_get_post_terms( $this->wp_object->ID, 'em_venue' ); + + if ( empty( $venue ) ) { + return null; + } else { + $venue = $venue[0]; + } + + $place = new Place(); + + $place->set_name( $venue->name ); + $place->set_content( $venue->description ); + + $address = get_term_meta( $venue->term_id, 'em_address', true ); + $display_address = get_term_meta( $venue->term_id, 'em_display_address_on_frontend', true ); + + if ( $address && $display_address ) { + $place->set_address( get_term_meta( $venue->term_id, 'em_address', true ) ); + } + + return $place; + } +} diff --git a/includes/activitypub/transformer/class-gatherpress.php b/includes/activitypub/transformer/class-gatherpress.php index 756524a..ea742b3 100644 --- a/includes/activitypub/transformer/class-gatherpress.php +++ b/includes/activitypub/transformer/class-gatherpress.php @@ -1,6 +1,6 @@ post_content && '[em_events]' !== $queried_object->post_content ) { + return false; + } + } + + // Check if header already sent. + if ( ! \headers_sent() && ACTIVITYPUB_SEND_VARY_HEADER ) { + // Send Vary header for Accept header. + \header( 'Vary: Accept' ); + } + + // One can trigger an ActivityPub request by adding ?activitypub to the URL. + if ( isset( $wp_query->query_vars['activitypub'] ) ) { + return true; + } + + /* + * The other (more common) option to make an ActivityPub request + * is to send an Accept header. + */ + if ( isset( $_SERVER['HTTP_ACCEPT'] ) ) { + $accept = sanitize_text_field( wp_unslash( $_SERVER['HTTP_ACCEPT'] ) ); + + /* + * $accept can be a single value, or a comma separated list of values. + * We want to support both scenarios, + * and return true when the header includes at least one of the following: + * - application/activity+json + * - application/ld+json + * - application/json + */ + if ( preg_match( '/(application\/(ld\+json|activity\+json|json))/i', $accept ) ) { + return true; + } + } + + return false; + } + + /** + * Extract the post id of the event for an EventPrime event query. + * + * @return bool|int The post ID if an event could be identified, false otherwise. + */ + private static function get_eventprime_post_id() { + $event = get_query_var( 'event' ); + if ( ! $event ) { + if ( ! empty( filter_input( INPUT_GET, 'event', FILTER_SANITIZE_FULL_SPECIAL_CHARS ) ) ) { + $event = rtrim( filter_input( INPUT_GET, 'event', FILTER_SANITIZE_FULL_SPECIAL_CHARS ), '/\\' ); + } + } + + if ( $event ) { + $ep_basic_functions = new Eventprime_Basic_Functions(); + return $ep_basic_functions->ep_get_id_by_slug( $event, 'em_event' ); + } + + return false; + } + + /** + * Add the ActivityPub template for EventPrime. + * + * @param string $template The path to the template object. + * @return string The new path to the JSON template. + */ + public static function render_activitypub_template( $template ) { + if ( defined( 'REST_REQUEST' ) && REST_REQUEST ) { + return $template; + } + + // Check if the request is a page with (solely) the eventprime shortcode in it. + if ( ! self::is_eventprime_activitypub_request() ) { + return $template; + } + + if ( ! \is_singular() ) { + return $template; + } + + $post_id = self::get_eventprime_post_id(); + + if ( $post_id ) { + $preview = \get_query_var( 'preview' ); + if ( $preview ) { + $activitypub_template = ACTIVITYPUB_PLUGIN_DIR . '/templates/post-preview.php'; + } else { + $activitypub_template = ACTIVITYPUB_PLUGIN_DIR . '/templates/post-json.php'; + } + } + + /* + * Check if the request is authorized. + * + * @see https://www.w3.org/wiki/SocialCG/ActivityPub/Primer/Authentication_Authorization#Authorized_fetch + * @see https://swicg.github.io/activitypub-http-signature/#authorized-fetch + */ + if ( $activitypub_template && ACTIVITYPUB_AUTHORIZED_FETCH ) { + $verification = Signature::verify_http_signature( $_SERVER ); + if ( \is_wp_error( $verification ) ) { + header( 'HTTP/1.1 401 Unauthorized' ); + + // Fallback as template_loader can't return http headers. + return $template; + } + } + + if ( $activitypub_template ) { + global $post; + + $post = get_post( $post_id ); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited + + // Ensure WordPress functions use the new post data. + setup_postdata( $post ); + // Return the default ActivityPub template. + return $activitypub_template; + } + + return $template; + } +} diff --git a/readme.txt b/readme.txt index 66ef1b9..f200dd6 100644 --- a/readme.txt +++ b/readme.txt @@ -57,6 +57,7 @@ This plugin depends on the [ActivityPub plugin](https://wordpress.org/plugins/ac * [Eventin](https://de.wordpress.org/plugins/wp-event-solution/) * [Modern Events Calendar Lite](https://webnus.net/modern-events-calendar/) * [GatherPress](https://gatherpress.org/) +* [EventPrime – Events Calendar, Bookings and Tickets](https://wordpress.org/plugins/eventprime-event-calendar-management/) == Configuration == diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 4262f2b..fef1717 100755 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -71,6 +71,9 @@ function _manually_load_plugin() { case 'wp_event_manager': $plugin_file = 'wp-event-manager/wp-event-manager.php'; break; + case 'eventprime': + $plugin_file = 'eventprime-event-calendar-management/event-prime.php'; + break; } if ( $plugin_file ) { diff --git a/tests/test-class-plugin-eventprime.php b/tests/test-class-plugin-eventprime.php new file mode 100644 index 0000000..354f6df --- /dev/null +++ b/tests/test-class-plugin-eventprime.php @@ -0,0 +1,186 @@ +activate_activitypub_support_for_active_event_plugins(); + + // Delete all posts afterwards. + _delete_all_posts(); + + $this->setup_mockup_data(); + } + + /** + * Setup mockup events. + */ + private function setup_mockup_data() { + $this->mockup_events = array( + 'minimal_event' => array( + 'name' => 'EventPrime Event title', + 'description' => 'EventPrime event description', + 'status' => 'Publish', + 'em_event_type' => '', + 'em_venue' => '', + 'em_organizer' => '', + 'em_performer' => '', + 'em_start_date' => strtotime( '+10 days 15:00:00' ), + 'em_end_date' => strtotime( '+10 days 16:00:00' ), + 'em_enable_booking' => 'bookings_off', + 'em_ticket_price' => 0, + ), + ); + + $this->mockup_venue = array( + 'name' => 'Test Venue', + 'address' => 'Fediverse-street 1337, 1234 Fediverse-town', + ); + } + + /** + * Test that the right transformer gets applied. + */ + public function test_the_events_calendar_transformer_class() { + // We only test for one event plugin being active at the same time, + // even though we support multiple onces in theory. + // But testing all combinations is beyond scope. + $active_event_plugins = \ActivityPub_Event_Bridge\Setup::get_instance()->get_active_event_plugins(); + $this->assertEquals( 1, count( $active_event_plugins ) ); + + // Enable ActivityPub support for the event plugin. + $this->assertContains( 'em_event', get_option( 'activitypub_support_post_types' ) ); + + // Create an EventPrime Event without content. + $ep_functions = new Eventprime_Basic_Functions(); + + $post_id = $ep_functions->insert_event_post_data( $this->mockup_events['minimal_event'] ); + + $wp_object = get_post( $post_id ); + + // Call the transformer Factory. + $transformer = \Activitypub\Transformer\Factory::get_transformer( $wp_object ); + + // Check that we got the right transformer. + $this->assertInstanceOf( \ActivityPub_Event_Bridge\Activitypub\Transformer\EventPrime::class, $transformer ); + } + + /** + * Test transformation of minimal event. + */ + public function test_transformation_of_minimal_event() { + // Create an EventPrime Event without content. + $ep_functions = new Eventprime_Basic_Functions(); + + $post_id = $ep_functions->insert_event_post_data( $this->mockup_events['minimal_event'] ); + + $wp_object = get_post( $post_id ); + + // Call the transformer Factory. + $event_array = \Activitypub\Transformer\Factory::get_transformer( $wp_object )->to_object()->to_array(); + + // Check that the event ActivityStreams representation contains everything as expected. + $this->assertEquals( 'Event', $event_array['type'] ); + $this->assertEquals( 'EventPrime Event title', $event_array['name'] ); + $this->assertEquals( 'EventPrime event description', wp_strip_all_tags( $event_array['content'] ) ); + $this->assertEquals( gmdate( 'Y-m-d', strtotime( '+10 days 15:00:00' ) ) . 'T15:00:00Z', $event_array['startTime'] ); + $this->assertEquals( gmdate( 'Y-m-d', strtotime( '+10 days 16:00:00' ) ) . 'T16:00:00Z', $event_array['endTime'] ); + $this->assertTrue( $event_array['commentsEnabled'] ); + $this->assertEquals( 'allow_all', $event_array['repliesModerationOption'] ); + $this->assertEquals( 'external', $event_array['joinMode'] ); + $this->assertArrayNotHasKey( 'location', $event_array ); + $this->assertEquals( 'MEETING', $event_array['category'] ); + } + + /** + * Test transformation of minimal event. + */ + public function test_transformation_of_minimal_event_with_venue() { + // Create an EventPrime Event without content. + $ep_functions = new Eventprime_Basic_Functions(); + + $venue_term_id = wp_insert_term( $this->mockup_venue['name'], 'em_venue' )['term_id']; + add_term_meta( $venue_term_id, 'em_address', $this->mockup_venue['address'], true ); + add_term_meta( $venue_term_id, 'em_display_address_on_frontend', true, true ); + + $event_data = $this->mockup_events['minimal_event']; + $event_data['em_venue'] = $venue_term_id; + + $post_id = $ep_functions->insert_event_post_data( $event_data ); + + $wp_object = get_post( $post_id ); + + // Call the transformer Factory. + $event_array = \Activitypub\Transformer\Factory::get_transformer( $wp_object )->to_object()->to_array(); + + // Check that the event ActivityStreams representation contains everything as expected. + $this->assertEquals( 'Event', $event_array['type'] ); + $this->assertEquals( 'EventPrime Event title', $event_array['name'] ); + $this->assertEquals( 'EventPrime event description', wp_strip_all_tags( $event_array['content'] ) ); + $this->assertEquals( gmdate( 'Y-m-d', strtotime( '+10 days 15:00:00' ) ) . 'T15:00:00Z', $event_array['startTime'] ); + $this->assertEquals( gmdate( 'Y-m-d', strtotime( '+10 days 16:00:00' ) ) . 'T16:00:00Z', $event_array['endTime'] ); + $this->assertTrue( $event_array['commentsEnabled'] ); + $this->assertEquals( 'allow_all', $event_array['repliesModerationOption'] ); + $this->assertEquals( 'external', $event_array['joinMode'] ); + $this->assertEquals( $this->mockup_venue['name'], $event_array['location']['name'] ); + $this->assertEquals( $this->mockup_venue['address'], $event_array['location']['address'] ); + + $this->assertEquals( 'MEETING', $event_array['category'] ); + } + + /** + * Test transformation of minimal event with venue which has a hidden address. + */ + public function test_transformation_of_minimal_event_with_venue_with_hidden_address() { + // Create an EventPrime Event without content. + $ep_functions = new Eventprime_Basic_Functions(); + + $venue_term_id = wp_insert_term( $this->mockup_venue['name'], 'em_venue' )['term_id']; + add_term_meta( $venue_term_id, 'em_address', $this->mockup_venue['address'], true ); + add_term_meta( $venue_term_id, 'em_display_address_on_frontend', false, true ); + + $event_data = $this->mockup_events['minimal_event']; + $event_data['em_venue'] = $venue_term_id; + + $post_id = $ep_functions->insert_event_post_data( $event_data ); + + $wp_object = get_post( $post_id ); + + // Call the transformer Factory. + $event_array = \Activitypub\Transformer\Factory::get_transformer( $wp_object )->to_object()->to_array(); + + // Check that the event ActivityStreams representation contains everything as expected. + $this->assertArrayNotHasKey( 'address', $event_array['location'] ); + } +} From 09ba5cac000276923f200047976d868f472f14ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Sat, 30 Nov 2024 12:26:42 +0100 Subject: [PATCH 6/9] Add Support for Event Organiser (#83) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-on: https://code.event-federation.eu/Event-Federation/wordpress-activitypub-event-bridge/pulls/83 Co-authored-by: André Menrath Co-committed-by: André Menrath --- .forgejo/workflows/phpunit.yml | 9 +- CHANGELOG.md | 1 + README.md | 2 + bin/install-wp-tests.sh | 1 + composer.json | 6 +- .../transformer/class-event-organiser.php | 99 ++++++++++++ includes/class-setup.php | 1 + includes/plugins/class-event-organiser.php | 69 ++++++++ readme.txt | 1 + tests/bootstrap.php | 3 + tests/test-class-plugin-event-organiser.php | 153 ++++++++++++++++++ 11 files changed, 341 insertions(+), 4 deletions(-) create mode 100644 includes/activitypub/transformer/class-event-organiser.php create mode 100644 includes/plugins/class-event-organiser.php create mode 100644 tests/test-class-plugin-event-organiser.php diff --git a/.forgejo/workflows/phpunit.yml b/.forgejo/workflows/phpunit.yml index c79e189..2f737d7 100644 --- a/.forgejo/workflows/phpunit.yml +++ b/.forgejo/workflows/phpunit.yml @@ -38,7 +38,7 @@ jobs: path: | ${{ env.WP_CORE_DIR }} ${{ env.WP_TESTS_DIR }} - key: cache-wordpress-67-3 + key: cache-wordpress-67-4 - name: Cache Composer id: cache-composer-phpunit @@ -113,4 +113,9 @@ jobs: - name: Run Integration tests for EventPrime run: cd /workspace/Event-Federation/wordpress-activitypub-event-bridge/ && ./vendor/bin/phpunit --filter=eventprime env: - PHP_VERSION: ${{ matrix.php-version }} \ No newline at end of file + PHP_VERSION: ${{ matrix.php-version }} + + - name: Run Integration tests for Event Organiser + run: cd /workspace/Event-Federation/wordpress-activitypub-event-bridge/ && ./vendor/bin/phpunit --filter=event_organiser + env: + PHP_VERSION: ${{ matrix.php-version }} diff --git a/CHANGELOG.md b/CHANGELOG.md index ce5ffe0..86dac31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +* Integration for Event Organiser * Integration for EventPrime – Events Calendar, Bookings and Tickets ### Fixed diff --git a/README.md b/README.md index 7e64f0f..c3d4e91 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,7 @@ This plugin depends on the [ActivityPub plugin](https://wordpress.org/plugins/ac * [Modern Events Calendar Lite](https://webnus.net/modern-events-calendar/) * [GatherPress](https://gatherpress.org/) * [EventPrime – Events Calendar, Bookings and Tickets](https://wordpress.org/plugins/eventprime-event-calendar-management/) +* [Event Organiser](https://wordpress.org/plugins/event-organiser/) ## Configuration ## @@ -105,6 +106,7 @@ We're always interested in your feedback. Feel free to reach out to us via [E-Ma ### Added +* Integration for Event Organiser * Integration for EventPrime – Events Calendar, Bookings and Tickets ### Fixed diff --git a/bin/install-wp-tests.sh b/bin/install-wp-tests.sh index 7cbf282..95fc2e5 100755 --- a/bin/install-wp-tests.sh +++ b/bin/install-wp-tests.sh @@ -261,6 +261,7 @@ install_wp_plugins() { install_wp_plugin events-manager "6.6.3" install_wp_plugin wp-event-manager "3.1.45.1" install_wp_plugin wp-event-solution "4.0.14" + install_wp_plugin event-organiser "3.12.8" # Mec is not installable via wordpress.org, we use our own mirror. install_wp_plugin_mec } diff --git a/composer.json b/composer.json index d4c2b0b..36e5525 100644 --- a/composer.json +++ b/composer.json @@ -55,11 +55,12 @@ "@test-wp-event-manager", "@test-eventin", "@test-modern-events-calendar-lite", - "@test-eventprime" + "@test-eventprime", + "@test-event-organiser" ], "test-debug": [ "@prepare-test", - "@test-eventprime" + "@test-event-organiser" ], "test-vs-event-list": "phpunit --filter=vs_event_list", "test-the-events-calendar": "phpunit --filter=the_events_calendar", @@ -69,6 +70,7 @@ "test-eventin": "phpunit --filter=eventin", "test-modern-events-calendar-lite": "phpunit --filter=modern_events_calendar_lite", "test-eventprime": "phpunit --filter=eventprime", + "test-event-organiser": "phpunit --filter=event_organiser", "test-all": "phpunit" } } diff --git a/includes/activitypub/transformer/class-event-organiser.php b/includes/activitypub/transformer/class-event-organiser.php new file mode 100644 index 0000000..fbbf1ea --- /dev/null +++ b/includes/activitypub/transformer/class-event-organiser.php @@ -0,0 +1,99 @@ +wp_object = get_posts( + array( + 'ID' => $wp_object->ID, + 'post_type' => 'event', + 'suppress_filters' => false, + ) + )[0]; + } + + /** + * Get the end time from the event object. + */ + protected function get_end_time(): ?string { + return eo_get_the_end( 'Y-m-d\TH:i:s\Z', $this->wp_object->ID, $this->wp_object->occurrence_id ); + } + + /** + * Get the end time from the event object. + */ + protected function get_start_time(): string { + return eo_get_the_start( 'Y-m-d\TH:i:s\Z', $this->wp_object->ID, $this->wp_object->occurrence_id ); + } + + /** + * Get location from the event object. + */ + protected function get_location(): ?Place { + $venue_id = eo_get_venue( $this->wp_object->ID ); + + if ( ! $venue_id ) { + return null; + } + + $address = eo_get_venue_address( $venue_id ); + + $venue_name = eo_get_venue_name( $venue_id ); + + $address['streetAddress'] = $address['address']; + unset( $address['address'] ); + + $address['postalCode'] = $address['postcode']; + unset( $address['postcode'] ); + + $address['addressRegion'] = $address['state']; + unset( $address['state'] ); + + $address['addressLocality'] = $address['city']; + unset( $address['city'] ); + + $address['addressCountry'] = $address['country']; + unset( $address['country'] ); + + $address['type'] = 'PostalAddress'; + + $location = new Place(); + $location->set_name( eo_get_venue_name( $this->wp_object->ID ) ); + $location->set_latitude( eo_get_venue_lat( $this->wp_object->ID ) ?? null ); + $location->set_longitude( eo_get_venue_lng( $this->wp_object->ID ) ?? null ); + $location->set_address( $address ); + $location->set_name( $venue_name ); + $location->set_content( eo_get_venue_description( $venue_id ) ); + + return $location; + } +} diff --git a/includes/class-setup.php b/includes/class-setup.php index 3b5ef0b..b99eda5 100644 --- a/includes/class-setup.php +++ b/includes/class-setup.php @@ -133,6 +133,7 @@ class Setup { '\ActivityPub_Event_Bridge\Plugins\Eventin', '\ActivityPub_Event_Bridge\Plugins\Modern_Events_Calendar_Lite', '\ActivityPub_Event_Bridge\Plugins\EventPrime', + '\ActivityPub_Event_Bridge\Plugins\Event_Organiser', ); /** diff --git a/includes/plugins/class-event-organiser.php b/includes/plugins/class-event-organiser.php new file mode 100644 index 0000000..d418bba --- /dev/null +++ b/includes/plugins/class-event-organiser.php @@ -0,0 +1,69 @@ +activate_activitypub_support_for_active_event_plugins(); + + // Run the install script just in time which makes sure the custom tables exist and more. + eventorganiser_install(); + + // Delete all posts afterwards. + _delete_all_posts(); + } + + /** + * Test that the right transformer gets applied. + */ + public function test_transformer_class() { + // We only test for one event plugin being active at the same time, + // even though we support multiple onces in theory. + // But testing all combinations is beyond scope. + $active_event_plugins = \ActivityPub_Event_Bridge\Setup::get_instance()->get_active_event_plugins(); + $this->assertEquals( 1, count( $active_event_plugins ) ); + + // Enable ActivityPub support for the event plugin. + $this->assertContains( 'event', get_option( 'activitypub_support_post_types' ) ); + + $event_data = array( + 'start' => new DateTime( '+10 days 15:00:00', eo_get_blog_timezone() ), + 'end' => new DateTime( '+10 days 16:00:00', eo_get_blog_timezone() ), + 'all_day' => 0, + 'schedule' => 'once', + ); + + $post_data = array( + 'post_title' => 'Unit Test Event', + 'post_content' => 'Unit Test description.', + 'post_status' => 'publish', + ); + + $post_id = eo_insert_event( $post_data, $event_data ); + + // Call the transformer Factory. + $transformer = \Activitypub\Transformer\Factory::get_transformer( get_post( $post_id ) ); + + // Check that we got the right transformer. + $this->assertInstanceOf( \ActivityPub_Event_Bridge\Activitypub\Transformer\Event_Organiser::class, $transformer ); + } + + /** + * Test transformation to ActivityPub for basic event. + */ + public function test_transform_of_basic_event() { + // Mock Event. + $event_data = array( + 'start' => new DateTime( '+10 days 15:00:00', eo_get_blog_timezone() ), + 'end' => new DateTime( '+10 days 16:00:00', eo_get_blog_timezone() ), + 'all_day' => 0, + 'schedule' => 'once', + ); + + $post_data = array( + 'post_title' => 'Unit Test Event', + 'post_content' => 'Unit Test description.', + 'post_status' => 'publish', + ); + + $post_id = eo_insert_event( $post_data, $event_data ); + + // Call the transformer Factory. + $event_array = \Activitypub\Transformer\Factory::get_transformer( get_post( $post_id ) )->to_object()->to_array(); + + // Check that the event ActivityStreams representation contains everything as expected. + $this->assertEquals( 'Event', $event_array['type'] ); + $this->assertEquals( 'Unit Test Event', $event_array['name'] ); + $this->assertEquals( 'Unit Test description.', wp_strip_all_tags( $event_array['content'] ) ); + $this->assertEquals( gmdate( 'Y-m-d', strtotime( '+10 days 15:00:00' ) ) . 'T15:00:00Z', $event_array['startTime'] ); + $this->assertEquals( gmdate( 'Y-m-d', strtotime( '+10 days 16:00:00' ) ) . 'T16:00:00Z', $event_array['endTime'] ); + $this->assertEquals( 'external', $event_array['joinMode'] ); + $this->assertArrayNotHasKey( 'location', $event_array ); + } + + /** + * Test transformation to ActivityPub for event with location. + */ + public function test_transform_of_event_with_location() { + // Create venue. + $venue_args = array( + 'description' => 'This is a test venue for the Fediverse.', + 'address' => 'Fediverse-Street 1337', + 'city' => 'Fediverse-Town', + 'state' => 'Fediverse-Sate', + 'postcode' => '1337', + 'country' => 'Fediverse-Country', + 'latitude' => 7.076668, + 'longitude' => 15.421371, + ); + $venue_name = 'Fediverse Venue'; + $venue = eo_insert_venue( $venue_name, $venue_args ); + + // Mock Event. + $event_data = array( + 'start' => new DateTime( '+10 days 15:00:00', eo_get_blog_timezone() ), + 'end' => new DateTime( '+10 days 16:00:00', eo_get_blog_timezone() ), + 'all_day' => 0, + 'schedule' => 'once', + ); + $post_data = array( + 'post_title' => 'Unit Test Event', + 'post_content' => 'Unit Test description.', + 'post_status' => 'publish', + ); + $post_id = eo_insert_event( $post_data, $event_data ); + wp_set_object_terms( $post_id, $venue['term_id'], 'event-venue' ); + + // Call the transformer Factory. + $event_array = \Activitypub\Transformer\Factory::get_transformer( get_post( $post_id ) )->to_object()->to_array(); + + // Check that the event ActivityStreams representation contains everything as expected. + $this->assertEquals( 'Event', $event_array['type'] ); + $this->assertEquals( 'Unit Test Event', $event_array['name'] ); + $this->assertEquals( 'Unit Test description.', wp_strip_all_tags( $event_array['content'] ) ); + $this->assertEquals( gmdate( 'Y-m-d', strtotime( '+10 days 15:00:00' ) ) . 'T15:00:00Z', $event_array['startTime'] ); + $this->assertEquals( gmdate( 'Y-m-d', strtotime( '+10 days 16:00:00' ) ) . 'T16:00:00Z', $event_array['endTime'] ); + $this->assertEquals( 'external', $event_array['joinMode'] ); + $this->assertArrayHasKey( 'location', $event_array ); + $this->assertEquals( $venue_args['description'], wp_strip_all_tags( $event_array['location']['content'] ) ); + $this->assertEquals( $venue_args['address'], $event_array['location']['address']['streetAddress'] ); + $this->assertEquals( $venue_args['city'], $event_array['location']['address']['addressLocality'] ); + $this->assertEquals( $venue_args['state'], $event_array['location']['address']['addressRegion'] ); + $this->assertEquals( $venue_args['country'], $event_array['location']['address']['addressCountry'] ); + $this->assertEquals( $venue_args['postcode'], $event_array['location']['address']['postalCode'] ); + $this->assertEquals( $venue_name, $event_array['location']['name'] ); + } +} From cacfb2a7303b02c4fa801426b8a01438419ef4cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Sat, 30 Nov 2024 16:10:53 +0100 Subject: [PATCH 7/9] Add PHP 8.4 to tests (#84) Reviewed-on: https://code.event-federation.eu/Event-Federation/wordpress-activitypub-event-bridge/pulls/84 --- .forgejo/workflows/phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/phpunit.yml b/.forgejo/workflows/phpunit.yml index 2f737d7..0fa5362 100644 --- a/.forgejo/workflows/phpunit.yml +++ b/.forgejo/workflows/phpunit.yml @@ -21,7 +21,7 @@ jobs: MYSQL_ROOT_PASSWORD: root strategy: matrix: - php-version: ['7.4', '8.0', '8.1', '8.2', '8.3'] + php-version: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4'] wordpress-version: ['6.7'] name: PHPUnit – PHP ${{ matrix.php-version }} env: From fa1796eec1ff03690d2d02d0dc9412868a152c04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Thu, 5 Dec 2024 16:16:30 +0100 Subject: [PATCH 8/9] Rename to 'Event Bridge for ActivityPub' However: Nobody owns 'ActivityPub' as a product name! I am just tired of discussing with the Wordress plugin team about how to interpret their rules. --- .forgejo/workflows/phpunit.yml | 18 +-- Gruntfile.js | 2 +- README.md | 10 +- activitypub-event-bridge.php | 36 ----- assets/css/activitypub-event-bridge-admin.css | 54 ++++---- assets/js/activitypub-event-bridge-admin.js | 2 +- composer.json | 6 +- docker-compose.yml | 2 +- docs/add_your_event_plugin.md | 18 +-- event-bridge-for-activitypub.php | 36 +++++ .../transformer/class-event-organiser.php | 6 +- .../activitypub/transformer/class-event.php | 22 +-- .../activitypub/transformer/class-eventin.php | 6 +- .../transformer/class-eventprime.php | 6 +- .../transformer/class-events-manager.php | 6 +- .../transformer/class-gatherpress.php | 6 +- .../class-modern-events-calendar-lite.php | 6 +- .../transformer/class-the-events-calendar.php | 6 +- .../transformer/class-vs-event-list.php | 6 +- .../transformer/class-wp-event-manager.php | 8 +- .../class-event-plugin-admin-notices.php | 8 +- .../admin/class-general-admin-notices.php | 28 ++-- includes/admin/class-health-check.php | 26 ++-- includes/admin/class-settings-page.php | 26 ++-- includes/class-autoloader.php | 10 +- includes/class-settings.php | 28 ++-- includes/class-setup.php | 78 +++++------ includes/event-categories.php | 68 +++++----- .../class-event-organiser.php | 4 +- .../class-event-plugin.php | 8 +- .../class-eventin.php | 4 +- .../class-eventprime.php | 4 +- .../class-events-manager.php | 4 +- .../class-gatherpress.php | 4 +- .../class-modern-events-calendar-lite.php | 4 +- .../class-the-events-calendar.php | 4 +- .../class-vs-event-list.php | 6 +- .../class-wp-event-manager.php | 6 +- package.json | 4 +- phpcs.xml | 4 +- readme.txt | 10 +- templates/admin-header.php | 18 +-- templates/settings.php | 42 +++--- templates/welcome.php | 128 +++++++++--------- tests/bootstrap.php | 14 +- tests/test-class-plugin-event-organiser.php | 8 +- tests/test-class-plugin-eventin.php | 8 +- tests/test-class-plugin-eventprime.php | 8 +- tests/test-class-plugin-events-manger.php | 8 +- tests/test-class-plugin-gatherpress.php | 8 +- ...ass-plugin-modern-events-calendar-lite.php | 8 +- .../test-class-plugin-the-events-calendar.php | 12 +- tests/test-class-plugin-vs-event-list.php | 12 +- tests/test-class-plugin-wp-event-manager.php | 10 +- 54 files changed, 442 insertions(+), 442 deletions(-) delete mode 100644 activitypub-event-bridge.php create mode 100644 event-bridge-for-activitypub.php rename includes/{plugins => integrations}/class-event-organiser.php (93%) rename includes/{plugins => integrations}/class-event-plugin.php (89%) rename includes/{plugins => integrations}/class-eventin.php (92%) rename includes/{plugins => integrations}/class-eventprime.php (98%) rename includes/{plugins => integrations}/class-events-manager.php (93%) rename includes/{plugins => integrations}/class-gatherpress.php (94%) rename includes/{plugins => integrations}/class-modern-events-calendar-lite.php (93%) rename includes/{plugins => integrations}/class-the-events-calendar.php (94%) rename includes/{plugins => integrations}/class-vs-event-list.php (90%) rename includes/{plugins => integrations}/class-wp-event-manager.php (90%) diff --git a/.forgejo/workflows/phpunit.yml b/.forgejo/workflows/phpunit.yml index 0fa5362..b695aff 100644 --- a/.forgejo/workflows/phpunit.yml +++ b/.forgejo/workflows/phpunit.yml @@ -76,46 +76,46 @@ jobs: run: bash bin/install-wp-tests.sh wordpress_test root root 127.0.0.1 ${{ matrix.wordpress-version }} false true true true - name: Run Integration tests for The Events Calendar - run: cd /workspace/Event-Federation/wordpress-activitypub-event-bridge/ && ./vendor/bin/phpunit --filter=the_events_calendar + run: cd /workspace/Event-Federation/wordpress-event-bridge-for-activitypub/ && ./vendor/bin/phpunit --filter=the_events_calendar env: PHP_VERSION: ${{ matrix.php-version }} - name: Run Integration tests for VS Event List - run: cd /workspace/Event-Federation/wordpress-activitypub-event-bridge/ && ./vendor/bin/phpunit --filter=vs_event_list + run: cd /workspace/Event-Federation/wordpress-event-bridge-for-activitypub/ && ./vendor/bin/phpunit --filter=vs_event_list env: PHP_VERSION: ${{ matrix.php-version }} - name: Run Integration tests for GatherPress - run: cd /workspace/Event-Federation/wordpress-activitypub-event-bridge/ && ./vendor/bin/phpunit --filter=gatherpress + run: cd /workspace/Event-Federation/wordpress-event-bridge-for-activitypub/ && ./vendor/bin/phpunit --filter=gatherpress env: PHP_VERSION: ${{ matrix.php-version }} - name: Run Integration tests for Events Manager - run: cd /workspace/Event-Federation/wordpress-activitypub-event-bridge/ && ./vendor/bin/phpunit --filter=events_manager + run: cd /workspace/Event-Federation/wordpress-event-bridge-for-activitypub/ && ./vendor/bin/phpunit --filter=events_manager env: PHP_VERSION: ${{ matrix.php-version }} - name: Run Integration tests for WP Event Manager - run: cd /workspace/Event-Federation/wordpress-activitypub-event-bridge/ && ./vendor/bin/phpunit --filter=wp_event_manager + run: cd /workspace/Event-Federation/wordpress-event-bridge-for-activitypub/ && ./vendor/bin/phpunit --filter=wp_event_manager env: PHP_VERSION: ${{ matrix.php-version }} - name: Run Integration tests for Eventin (WP Event Solution) - run: cd /workspace/Event-Federation/wordpress-activitypub-event-bridge/ && ./vendor/bin/phpunit --filter=eventin + run: cd /workspace/Event-Federation/wordpress-event-bridge-for-activitypub/ && ./vendor/bin/phpunit --filter=eventin env: PHP_VERSION: ${{ matrix.php-version }} - name: Run Integration tests for Modern Events Calendar Lite - run: cd /workspace/Event-Federation/wordpress-activitypub-event-bridge/ && ./vendor/bin/phpunit --filter=modern_events_calendar_lite + run: cd /workspace/Event-Federation/wordpress-event-bridge-for-activitypub/ && ./vendor/bin/phpunit --filter=modern_events_calendar_lite env: PHP_VERSION: ${{ matrix.php-version }} - name: Run Integration tests for EventPrime - run: cd /workspace/Event-Federation/wordpress-activitypub-event-bridge/ && ./vendor/bin/phpunit --filter=eventprime + run: cd /workspace/Event-Federation/wordpress-event-bridge-for-activitypub/ && ./vendor/bin/phpunit --filter=eventprime env: PHP_VERSION: ${{ matrix.php-version }} - name: Run Integration tests for Event Organiser - run: cd /workspace/Event-Federation/wordpress-activitypub-event-bridge/ && ./vendor/bin/phpunit --filter=event_organiser + run: cd /workspace/Event-Federation/wordpress-event-bridge-for-activitypub/ && ./vendor/bin/phpunit --filter=event_organiser env: PHP_VERSION: ${{ matrix.php-version }} diff --git a/Gruntfile.js b/Gruntfile.js index df4eb26..4b2c893 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -4,7 +4,7 @@ module.exports = function (grunt) { { checktextdomain: { options:{ - text_domain: 'activitypub-event-bridge', + text_domain: 'event-bridge-for-activitypub', keywords: [ '__:1,2d', '_e:1,2d', diff --git a/README.md b/README.md index c3d4e91..5a75467 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ActivityPub Event Bridge # +# Event Bridge for ActivityPub # **Contributors:** [andremenrath](https://profiles.wordpress.org/andremenrath/) **Tags:** events, fediverse, activitypub, calendar **Requires at least:** 6.5 @@ -14,7 +14,7 @@ Integrating popular event plugins with the ActivityPub plugin. ## Description ## Make your events more discoverable, expand your reach effortlessly while being independent of other (commercial) platforms, and be a part of the growing decentralized web (the Fediverse). -With the ActivityPub Event Bridge Plugin for WordPress, your events can be automatically followed, aggregated and displayed across decentralized platforms like [Mastodon](https://joinmastodon.org) or [Gancio](https://gancio.org), without any extra work. +With the Event Bridge for ActivityPub Plugin for WordPress, your events can be automatically followed, aggregated and displayed across decentralized platforms like [Mastodon](https://joinmastodon.org) or [Gancio](https://gancio.org), without any extra work. Forget the hassle of managing multiple social media accounts just to keep your audience informed. This plugin is not an event managing plugin but an add-on to popular event plugins. It extends their functionality to fully support the [ActivityPub plugin](https://wordpress.org/plugins/activitypub/). @@ -23,7 +23,7 @@ You retain full ownership of your content. By integrating into your existing set ### How It Works ### -With the ActivityPub Event Bridge WordPress plugin, sharing your events is effortless and automatic! +With the Event Bridge for ActivityPub WordPress plugin, sharing your events is effortless and automatic! Once you create an event on your WordPress site, it is seamlessly shared across the decentralized web using the ActivityPub protocol.

@@ -94,11 +94,11 @@ No, the Event Federation Plugin depends on the [ActivityPub plugin](https://word ### My event plugin is not supported, what can I do? ### -If you know about coding have a look at the documentation of how to add your plugin or open an [issue](https://code.event-federation.eu/Event-Federation/wordpress-activitypub-event-bridge/issues), if we can spare some free hours we might add it. +If you know about coding have a look at the documentation of how to add your plugin or open an [issue](https://code.event-federation.eu/Event-Federation/wordpress-event-bridge-for-activitypub/issues), if we can spare some free hours we might add it. ### What if I experience problems? ### -We're always interested in your feedback. Feel free to reach out to us via [E-Mail](https://event-federation.eu/contact/) or create an [issue](https://code.event-federation.eu/Event-Federation/wordpress-activitypub-event-bridge/issues). +We're always interested in your feedback. Feel free to reach out to us via [E-Mail](https://event-federation.eu/contact/) or create an [issue](https://code.event-federation.eu/Event-Federation/wordpress-event-bridge-for-activitypub/issues). ## Changelog ## diff --git a/activitypub-event-bridge.php b/activitypub-event-bridge.php deleted file mode 100644 index 961af39..0000000 --- a/activitypub-event-bridge.php +++ /dev/null @@ -1,36 +0,0 @@ -= 3.2.2. ActivityPub plugin tested up to: 4.2.0. - * - * @package ActivityPub_Event_Bridge - * @license AGPL-3.0-or-later - */ - -// Exit if accessed directly. -defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore - -define( 'ACTIVITYPUB_EVENT_BRIDGE_PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); -define( 'ACTIVITYPUB_EVENT_BRIDGE_PLUGIN_BASENAME', plugin_basename( __FILE__ ) ); -define( 'ACTIVITYPUB_EVENT_BRIDGE_PLUGIN_FILE', plugin_dir_path( __FILE__ ) . '/' . basename( __FILE__ ) ); -define( 'ACTIVITYPUB_EVENT_BRIDGE_PLUGIN_URL', plugin_dir_url( __FILE__ ) ); -define( 'ACTIVITYPUB_EVENT_BRIDGE_PLUGIN_VERSION', current( get_file_data( __FILE__, array( 'Version' ), 'plugin' ) ) ); -define( 'ACTIVITYPUB_EVENT_BRIDGE_DOMAIN', 'activitypub-event-bridge' ); -define( 'ACTIVITYPUB_EVENT_BRIDGE_ACTIVITYPUB_PLUGIN_MIN_VERSION', '3.2.2' ); - -// Include and register the autoloader class for automatic loading of plugin classes. -require_once ACTIVITYPUB_EVENT_BRIDGE_PLUGIN_DIR . '/includes/class-autoloader.php'; -ActivityPub_Event_Bridge\Autoloader::register(); - -// Initialize the plugin. -ActivityPub_Event_Bridge\Setup::get_instance(); diff --git a/assets/css/activitypub-event-bridge-admin.css b/assets/css/activitypub-event-bridge-admin.css index c89ec6e..27e164a 100644 --- a/assets/css/activitypub-event-bridge-admin.css +++ b/assets/css/activitypub-event-bridge-admin.css @@ -1,19 +1,19 @@ -.settings_page_activitypub-event-bridge #wpcontent { +.settings_page_event-bridge-for-activitypub #wpcontent { padding-left: 0; } -.activitypub-event-bridge-settings-page .box { +.event-bridge-for-activitypub-settings-page .box { border: 1px solid #c3c4c7; background-color: #fff; padding: 1em 1.5em; margin-bottom: 1.5em; } -.activitypub-event-bridge-settings-page .box ul.activitypub-event-bridge-list { +.event-bridge-for-activitypub-settings-page .box ul.event-bridge-for-activitypub-list { margin-left: 0.6em; } -.activitypub-event-bridge-settings-page .box pre { +.event-bridge-for-activitypub-settings-page .box pre { padding: 1rem; min-height: 200px; box-shadow: none; @@ -22,19 +22,19 @@ background-color: #f7f7f7; } -.activitypub-event-bridge-settings { +.event-bridge-for-activitypub-settings { max-width: 800px; margin: 0 auto; } -.activitypub-event-bridge-settings-header { +.event-bridge-for-activitypub-settings-header { text-align: center; margin: 0 0 1rem; background: #fff; border-bottom: 1px solid #dcdcde; } -.activitypub-event-bridge-settings-title-section { +.event-bridge-for-activitypub-settings-title-section { display: flex; align-items: center; justify-content: center; @@ -42,7 +42,7 @@ padding-top: 8px; } -.activitypub-event-bridge-settings-tabs-wrapper { +.event-bridge-for-activitypub-settings-tabs-wrapper { display: -ms-inline-grid; -ms-grid-columns: auto auto auto auto; vertical-align: top; @@ -50,12 +50,12 @@ grid-template-columns: auto auto auto auto; } -.activitypub-event-bridge-settings-tab.active { +.event-bridge-for-activitypub-settings-tab.active { box-shadow: inset 0 -3px #3582c4; font-weight: 600; } -.activitypub-event-bridge-settings-tab { +.event-bridge-for-activitypub-settings-tab { display: block; text-decoration: none; color: inherit; @@ -64,21 +64,21 @@ transition: box-shadow .5s ease-in-out; } -.activitypub-event-bridge-settings .box h3 { +.event-bridge-for-activitypub-settings .box h3 { font-size: 1.15em; margin-bottom: 0em; } -#activitypub_event_bridge_initially_activated { +#event_bridge_for_activitypub_initially_activated { display: hidden; } /* Accordions for admin pages */ -.activitypub-event-bridge-settings-accordion { +.event-bridge-for-activitypub-settings-accordion { border: 1px solid #c3c4c7; } -.activitypub-event-bridge-settings-accordion-heading { +.event-bridge-for-activitypub-settings-accordion-heading { margin: 0; border-top: 1px solid #c3c4c7; font-size: inherit; @@ -87,17 +87,17 @@ color: inherit; } -.activitypub-event-bridge-settings-accordion-heading:first-child { +.event-bridge-for-activitypub-settings-accordion-heading:first-child { border-top: none; } -.activitypub-event-bridge-settings-accordion-panel { +.event-bridge-for-activitypub-settings-accordion-panel { margin: 0; padding: 1em 1.5em; background: #fff; } -.activitypub-event-bridge-settings-accordion-trigger { +.event-bridge-for-activitypub-settings-accordion-trigger { background: #fff; border: 0; color: #2c3338; @@ -116,21 +116,21 @@ user-select: auto; } -.activitypub-event-bridge-settings-accordion-trigger { +.event-bridge-for-activitypub-settings-accordion-trigger { color: #2c3338; cursor: pointer; font-weight: 400; text-align: left; } -.activitypub-event-bridge-settings-accordion-trigger .title { +.event-bridge-for-activitypub-settings-accordion-trigger .title { pointer-events: none; font-weight: 600; flex-grow: 1; } -.activitypub-event-bridge-settings-accordion-trigger .icon, -.activitypub-event-bridge-settings-accordion-viewed .icon { +.event-bridge-for-activitypub-settings-accordion-trigger .icon, +.event-bridge-for-activitypub-settings-accordion-viewed .icon { border: solid #50575e medium; border-width: 0 2px 2px 0; height: .5rem; @@ -142,16 +142,16 @@ width: .5rem; } -.activitypub-event-bridge-settings-accordion-trigger[aria-expanded="true"] .icon { +.event-bridge-for-activitypub-settings-accordion-trigger[aria-expanded="true"] .icon { transform: translateY(-30%) rotate(-135deg); } -.activitypub-event-bridge-settings-accordion-trigger:active, -.activitypub-event-bridge-settings-accordion-trigger:hover { +.event-bridge-for-activitypub-settings-accordion-trigger:active, +.event-bridge-for-activitypub-settings-accordion-trigger:hover { background: #f6f7f7; } -.activitypub-event-bridge-settings-accordion-trigger:focus { +.event-bridge-for-activitypub-settings-accordion-trigger:focus { color: #1d2327; border: none; box-shadow: none; @@ -160,14 +160,14 @@ background-color: #f6f7f7; } -.activitypub-event-bridge-settings-inline-icon { +.event-bridge-for-activitypub-settings-inline-icon { width: 1.5em; height: 1.5em; vertical-align: middle; margin: 0 0.3em; } -code.activitypub-event-bridge-settings-example-url { +code.event-bridge-for-activitypub-settings-example-url { display: block; background: rgb(28, 29, 33); padding: 8px; diff --git a/assets/js/activitypub-event-bridge-admin.js b/assets/js/activitypub-event-bridge-admin.js index bf00a1c..d2eb9ea 100644 --- a/assets/js/activitypub-event-bridge-admin.js +++ b/assets/js/activitypub-event-bridge-admin.js @@ -1,6 +1,6 @@ jQuery( function( $ ) { // Accordion handling in various areas. - $( '.activitypub-event-bridge-settings-accordion' ).on( 'click', '.activitypub-event-bridge-settings-accordion-trigger', function() { + $( '.event-bridge-for-activitypub-settings-accordion' ).on( 'click', '.event-bridge-for-activitypub-settings-accordion-trigger', function() { var isExpanded = ( 'true' === $( this ).attr( 'aria-expanded' ) ); if ( isExpanded ) { diff --git a/composer.json b/composer.json index 36e5525..0431a7b 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { - "name": "menrath/wordpress-activitypub-event-bridge", + "name": "menrath/wordpress-event-bridge-for-activitypub", "version": "1.0.0", - "description": "The ActivityPub Event Bridge help for event custom post types to federate properly.", + "description": "The Event Bridge for ActivityPub help for event custom post types to federate properly.", "type": "wordpress-plugin", "require": { "php": ">=7.4.0", @@ -33,7 +33,7 @@ } ], "extra": { - "installer-name": "activitypub-event-bridge" + "installer-name": "event-bridge-for-activitypub" }, "scripts": { "lint": [ diff --git a/docker-compose.yml b/docker-compose.yml index d39760b..c95f996 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,7 +16,7 @@ version: '3' # "request": "launch", # "port": 9003, # "pathMappings": { -# "/app/": "${workspaceRoot}/wp-content/plugins/activitypub-event-bridge/", +# "/app/": "${workspaceRoot}/wp-content/plugins/event-bridge-for-activitypub/", # "/tmp/wordpress/": "${workspaceRoot}/" # }, # }, diff --git a/docs/add_your_event_plugin.md b/docs/add_your_event_plugin.md index 165f285..e104340 100644 --- a/docs/add_your_event_plugin.md +++ b/docs/add_your_event_plugin.md @@ -13,7 +13,7 @@ To make the WordPress ActivityPub plugin use a custom transformer simply add a f First you need to add some basic information about your event plugin. Just create a new file in `./includes/plugins/my-event-plugin.php`. Implement at least all abstract functions of the `Event_Plugin` class. ```php - namespace ActivityPub_Event_Bridge\Plugins; + namespace Event_Bridge_For_ActivityPub\Integrations; // Exit if accessed directly. defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore @@ -28,16 +28,16 @@ First you need to add some basic information about your event plugin. Just creat final class My_Event_Plugin extends Event_Plugin { ``` -Then you need to tell the ActivityPub Event Bridge about that class by adding it to the `EVENT_PLUGIN_CLASSES` constant in the `includes/setup.php` file: +Then you need to tell the Event Bridge for ActivityPub about that class by adding it to the `EVENT_PLUGIN_CLASSES` constant in the `includes/setup.php` file: ```php private const EVENT_PLUGIN_CLASSES = array( ... - '\ActivityPub_Event_Bridge\Plugins\My_Event_Plugin', + '\Event_Bridge_For_ActivityPub\Integrations\My_Event_Plugin', ); ``` -The ActivityPub Event Bridge then takes care of applying the transformer, so you can jump right into implementing it. +The Event Bridge for ActivityPub then takes care of applying the transformer, so you can jump right into implementing it. ## Writing an event transformer class @@ -48,9 +48,9 @@ If you are writing a transformer for your event post type we recommend to start So create a new file at `./includes/activitypub/transformer/my-event-plugin.php`. ```php -namespace ActivityPub_Event_Bridge\Activitypub\Transformer; +namespace Event_Bridge_For_ActivityPub\Activitypub\Transformer; -use ActivityPub_Event_Bridge\Activitypub\Transformer\Event as Event_Transformer; +use Event_Bridge_For_ActivityPub\Activitypub\Transformer\Event as Event_Transformer; /** * ActivityPub Transformer for My Event Plugin' event post type. @@ -142,7 +142,7 @@ Implement a check whether your event plugin is active in the `set_up` function. } // Make sure that ActivityPub support is enabled for The Events Calendar. - $aec = \ActivityPub_Event_Bridge\Setup::get_instance(); + $aec = \Event_Bridge_For_ActivityPub\Setup::get_instance(); $aec->activate_activitypub_support_for_active_event_plugins(); // Delete all posts afterwards. @@ -180,7 +180,7 @@ In the pipeline we want to run each event plugins integration tests in a single To activate/load your plugin add it to the switch statement within the function `_manually_load_plugin()` within `tests/bootstrap.php`. ```php - switch ( $activitypub_event_bridge_integration_filter ) { + switch ( $event_bridge_for_activitypub_integration_filter ) { ... case 'my_event_plugin': $plugin_file = 'my-event-plugin/my-event-plugin.php'; @@ -213,7 +213,7 @@ If you are using Visual Studio Code or VSCodium you can step-debug within the te "request": "launch", "port": 9003, "pathMappings": { - "/app/": "${workspaceRoot}/wp-content/plugins/activitypub-event-bridge/", + "/app/": "${workspaceRoot}/wp-content/plugins/event-bridge-for-activitypub/", "/tmp/wordpress/": "${workspaceRoot}/" }, } diff --git a/event-bridge-for-activitypub.php b/event-bridge-for-activitypub.php new file mode 100644 index 0000000..c2a0fc9 --- /dev/null +++ b/event-bridge-for-activitypub.php @@ -0,0 +1,36 @@ += 3.2.2. ActivityPub plugin tested up to: 4.2.0. + * + * @package Event_Bridge_For_ActivityPub + * @license AGPL-3.0-or-later + */ + +// Exit if accessed directly. +defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore + +define( 'EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); +define( 'EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_BASENAME', plugin_basename( __FILE__ ) ); +define( 'EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_FILE', plugin_dir_path( __FILE__ ) . '/' . basename( __FILE__ ) ); +define( 'EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_URL', plugin_dir_url( __FILE__ ) ); +define( 'EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_VERSION', current( get_file_data( __FILE__, array( 'Version' ), 'plugin' ) ) ); +define( 'EVENT_BRIDGE_FOR_ACTIVITYPUB_DOMAIN', 'event-bridge-for-activitypub' ); +define( 'EVENT_BRIDGE_FOR_ACTIVITYPUB_ACTIVITYPUB_PLUGIN_MIN_VERSION', '3.2.2' ); + +// Include and register the autoloader class for automatic loading of plugin classes. +require_once EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_DIR . '/includes/class-autoloader.php'; +Event_Bridge_For_ActivityPub\Autoloader::register(); + +// Initialize the plugin. +Event_Bridge_For_ActivityPub\Setup::get_instance(); diff --git a/includes/activitypub/transformer/class-event-organiser.php b/includes/activitypub/transformer/class-event-organiser.php index fbbf1ea..54e8cdf 100644 --- a/includes/activitypub/transformer/class-event-organiser.php +++ b/includes/activitypub/transformer/class-event-organiser.php @@ -2,17 +2,17 @@ /** * ActivityPub Transformer for the plugin Event Organiser. * - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @license AGPL-3.0-or-later */ -namespace ActivityPub_Event_Bridge\Activitypub\Transformer; +namespace Event_Bridge_For_ActivityPub\Activitypub\Transformer; // Exit if accessed directly. defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore use Activitypub\Activity\Extended_Object\Place; -use ActivityPub_Event_Bridge\Activitypub\Transformer\Event; +use Event_Bridge_For_ActivityPub\Activitypub\Transformer\Event; /** * ActivityPub Transformer for Event Organiser. diff --git a/includes/activitypub/transformer/class-event.php b/includes/activitypub/transformer/class-event.php index babf2b9..730a943 100644 --- a/includes/activitypub/transformer/class-event.php +++ b/includes/activitypub/transformer/class-event.php @@ -2,11 +2,11 @@ /** * Replace the default ActivityPub Transformer * - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @license AGPL-3.0-or-later */ -namespace ActivityPub_Event_Bridge\Activitypub\Transformer; +namespace Event_Bridge_For_ActivityPub\Activitypub\Transformer; // Exit if accessed directly. defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore @@ -118,7 +118,7 @@ abstract class Event extends Post { if ( is_null( $this->wp_taxonomy ) ) { return null; } - $current_category_mapping = \get_option( 'activitypub_event_bridge_event_category_mappings', array() ); + $current_category_mapping = \get_option( 'event_bridge_for_activitypub_event_category_mappings', array() ); $terms = \get_the_terms( $this->wp_object, $this->wp_taxonomy ); // Check if the event has a category set and if that category has a specific mapping return that one. @@ -126,7 +126,7 @@ abstract class Event extends Post { return sanitize_text_field( $current_category_mapping[ $terms[0]->slug ] ); } else { // Return the default event category. - return sanitize_text_field( \get_option( 'activitypub_event_bridge_default_event_category', 'MEETING' ) ); + return sanitize_text_field( \get_option( 'event_bridge_for_activitypub_default_event_category', 'MEETING' ) ); } } @@ -235,10 +235,10 @@ abstract class Event extends Post { $categories = array(); // Add the federated category string. - require_once ACTIVITYPUB_EVENT_BRIDGE_PLUGIN_DIR . '/includes/event-categories.php'; + require_once EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_DIR . '/includes/event-categories.php'; $federated_category = $this->get_category(); - if ( array_key_exists( $federated_category, ACTIVITYPUB_EVENT_BRIDGE_EVENT_CATEGORIES ) ) { - $categories[] = ACTIVITYPUB_EVENT_BRIDGE_EVENT_CATEGORIES[ $federated_category ]; + if ( array_key_exists( $federated_category, EVENT_BRIDGE_FOR_ACTIVITYPUB_EVENT_CATEGORIES ) ) { + $categories[] = EVENT_BRIDGE_FOR_ACTIVITYPUB_EVENT_CATEGORIES[ $federated_category ]; } // Add all category terms. @@ -280,19 +280,19 @@ abstract class Event extends Post { $formatted_items = array(); if ( ! empty( $category ) ) { - $formatted_items[] = '🏷️ ' . __( 'Category', 'activitypub-event-bridge' ) . ': ' . $category; + $formatted_items[] = '🏷️ ' . __( 'Category', 'event-bridge-for-activitypub' ) . ': ' . $category; } if ( ! empty( $start_time ) ) { - $formatted_items[] = '🗓️ ' . __( 'Start', 'activitypub-event-bridge' ) . ': ' . $start_time; + $formatted_items[] = '🗓️ ' . __( 'Start', 'event-bridge-for-activitypub' ) . ': ' . $start_time; } if ( ! empty( $end_time ) ) { - $formatted_items[] = '⏳ ' . __( 'End', 'activitypub-event-bridge' ) . ': ' . $end_time; + $formatted_items[] = '⏳ ' . __( 'End', 'event-bridge-for-activitypub' ) . ': ' . $end_time; } if ( ! empty( $address ) ) { - $formatted_items[] = '📍 ' . __( 'Address', 'activitypub-event-bridge' ) . ': ' . $address; + $formatted_items[] = '📍 ' . __( 'Address', 'event-bridge-for-activitypub' ) . ': ' . $address; } // Compose the summary based on the number of meta items. diff --git a/includes/activitypub/transformer/class-eventin.php b/includes/activitypub/transformer/class-eventin.php index b47d93e..7b4131d 100644 --- a/includes/activitypub/transformer/class-eventin.php +++ b/includes/activitypub/transformer/class-eventin.php @@ -4,17 +4,17 @@ * * @link https://support.themewinter.com/docs/plugins/docs-category/eventin/ * - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @license AGPL-3.0-or-later */ -namespace ActivityPub_Event_Bridge\Activitypub\Transformer; +namespace Event_Bridge_For_ActivityPub\Activitypub\Transformer; // Exit if accessed directly. defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore use Activitypub\Activity\Extended_Object\Place; -use ActivityPub_Event_Bridge\Activitypub\Transformer\Event; +use Event_Bridge_For_ActivityPub\Activitypub\Transformer\Event; use DateTime; use DateTimeZone; use Etn\Core\Event\Event_Model; diff --git a/includes/activitypub/transformer/class-eventprime.php b/includes/activitypub/transformer/class-eventprime.php index c247ebe..8fa5d4b 100644 --- a/includes/activitypub/transformer/class-eventprime.php +++ b/includes/activitypub/transformer/class-eventprime.php @@ -2,17 +2,17 @@ /** * ActivityPub Transformer for the plugin EventPrime. * - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @license AGPL-3.0-or-later */ -namespace ActivityPub_Event_Bridge\Activitypub\Transformer; +namespace Event_Bridge_For_ActivityPub\Activitypub\Transformer; // Exit if accessed directly. defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore use Activitypub\Activity\Extended_Object\Place; -use ActivityPub_Event_Bridge\Activitypub\Transformer\Event; +use Event_Bridge_For_ActivityPub\Activitypub\Transformer\Event; /** * ActivityPub Transformer for VS Event diff --git a/includes/activitypub/transformer/class-events-manager.php b/includes/activitypub/transformer/class-events-manager.php index 1def3f7..92fbad2 100644 --- a/includes/activitypub/transformer/class-events-manager.php +++ b/includes/activitypub/transformer/class-events-manager.php @@ -2,17 +2,17 @@ /** * ActivityPub Transformer for the plugin Very Simple Event List. * - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @license AGPL-3.0-or-later */ -namespace ActivityPub_Event_Bridge\Activitypub\Transformer; +namespace Event_Bridge_For_ActivityPub\Activitypub\Transformer; // Exit if accessed directly. defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore use Activitypub\Activity\Extended_Object\Place; -use ActivityPub_Event_Bridge\Activitypub\Transformer\Event as Event_Transformer; +use Event_Bridge_For_ActivityPub\Activitypub\Transformer\Event as Event_Transformer; use DateTime; use DateTimeZone; use EM_Event; diff --git a/includes/activitypub/transformer/class-gatherpress.php b/includes/activitypub/transformer/class-gatherpress.php index ea742b3..5adf245 100644 --- a/includes/activitypub/transformer/class-gatherpress.php +++ b/includes/activitypub/transformer/class-gatherpress.php @@ -2,18 +2,18 @@ /** * ActivityPub Transformer for the GatherPress event plugin. * - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @license AGPL-3.0-or-later */ -namespace ActivityPub_Event_Bridge\Activitypub\Transformer; +namespace Event_Bridge_For_ActivityPub\Activitypub\Transformer; // Exit if accessed directly. defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore use Activitypub\Activity\Extended_Object\Event as Event_Object; use Activitypub\Activity\Extended_Object\Place; -use ActivityPub_Event_Bridge\Activitypub\Transformer\Event; +use Event_Bridge_For_ActivityPub\Activitypub\Transformer\Event; use GatherPress\Core\Event as GatherPress_Event; /** diff --git a/includes/activitypub/transformer/class-modern-events-calendar-lite.php b/includes/activitypub/transformer/class-modern-events-calendar-lite.php index 8622de4..edff084 100644 --- a/includes/activitypub/transformer/class-modern-events-calendar-lite.php +++ b/includes/activitypub/transformer/class-modern-events-calendar-lite.php @@ -2,17 +2,17 @@ /** * ActivityPub Tribe Transformer * - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @license AGPL-3.0-or-later */ -namespace ActivityPub_Event_Bridge\Activitypub\Transformer; +namespace Event_Bridge_For_ActivityPub\Activitypub\Transformer; // Exit if accessed directly. defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore use Activitypub\Activity\Extended_Object\Place; -use ActivityPub_Event_Bridge\Activitypub\Transformer\Event; +use Event_Bridge_For_ActivityPub\Activitypub\Transformer\Event; use MEC; use MEC\Events\Event as MEC_Event; diff --git a/includes/activitypub/transformer/class-the-events-calendar.php b/includes/activitypub/transformer/class-the-events-calendar.php index f50fa29..faa6f4f 100644 --- a/includes/activitypub/transformer/class-the-events-calendar.php +++ b/includes/activitypub/transformer/class-the-events-calendar.php @@ -2,17 +2,17 @@ /** * ActivityPub Tribe Transformer * - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @license AGPL-3.0-or-later */ -namespace ActivityPub_Event_Bridge\Activitypub\Transformer; +namespace Event_Bridge_For_ActivityPub\Activitypub\Transformer; // Exit if accessed directly. defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore use Activitypub\Activity\Extended_Object\Place; -use ActivityPub_Event_Bridge\Activitypub\Transformer\Event; +use Event_Bridge_For_ActivityPub\Activitypub\Transformer\Event; use WP_Post; use function Activitypub\esc_hashtag; diff --git a/includes/activitypub/transformer/class-vs-event-list.php b/includes/activitypub/transformer/class-vs-event-list.php index c476404..d67cd77 100644 --- a/includes/activitypub/transformer/class-vs-event-list.php +++ b/includes/activitypub/transformer/class-vs-event-list.php @@ -2,17 +2,17 @@ /** * ActivityPub Transformer for the plugin Very Simple Event List. * - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @license AGPL-3.0-or-later */ -namespace ActivityPub_Event_Bridge\Activitypub\Transformer; +namespace Event_Bridge_For_ActivityPub\Activitypub\Transformer; // Exit if accessed directly. defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore use Activitypub\Activity\Extended_Object\Place; -use ActivityPub_Event_Bridge\Activitypub\Transformer\Event as Event_Transformer; +use Event_Bridge_For_ActivityPub\Activitypub\Transformer\Event as Event_Transformer; /** * ActivityPub Transformer for VS Event. diff --git a/includes/activitypub/transformer/class-wp-event-manager.php b/includes/activitypub/transformer/class-wp-event-manager.php index 6330152..7985291 100644 --- a/includes/activitypub/transformer/class-wp-event-manager.php +++ b/includes/activitypub/transformer/class-wp-event-manager.php @@ -2,17 +2,17 @@ /** * ActivityPub Transformer for the plugin Very Simple Event List. * - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @license AGPL-3.0-or-later */ -namespace ActivityPub_Event_Bridge\Activitypub\Transformer; +namespace Event_Bridge_For_ActivityPub\Activitypub\Transformer; // Exit if accessed directly. defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore use Activitypub\Activity\Extended_Object\Place; -use ActivityPub_Event_Bridge\Activitypub\Transformer\Event as Event_Transformer; +use Event_Bridge_For_ActivityPub\Activitypub\Transformer\Event as Event_Transformer; use DateTime; /** @@ -101,7 +101,7 @@ final class WP_Event_Manager extends Event_Transformer { if ( str_starts_with( $event_link_url, 'http' ) ) { return array( 'type' => 'Link', - 'name' => \esc_html__( 'Video URL', 'activitypub-event-bridge' ), + 'name' => \esc_html__( 'Video URL', 'event-bridge-for-activitypub' ), 'href' => \esc_url( $event_link_url ), 'mediaType' => 'text/html', ); diff --git a/includes/admin/class-event-plugin-admin-notices.php b/includes/admin/class-event-plugin-admin-notices.php index 73ed33c..823472e 100644 --- a/includes/admin/class-event-plugin-admin-notices.php +++ b/includes/admin/class-event-plugin-admin-notices.php @@ -4,17 +4,17 @@ * * Notices for guiding to proper configuration of ActivityPub with event plugins. * - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @since 1.0.0 * @license AGPL-3.0-or-later */ -namespace ActivityPub_Event_Bridge\Admin; +namespace Event_Bridge_For_ActivityPub\Admin; // Exit if accessed directly. defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore -use ActivityPub_Event_Bridge\Plugins\Event_Plugin; +use Event_Bridge_For_ActivityPub\Integrations\Event_Plugin; /** * Class responsible for Event Plugin related admin notices. @@ -76,7 +76,7 @@ class Event_Plugin_Admin_Notices { _x( 'You have installed the %1$s plugin, but the event post type of the plugin %2$s is not enabled in the %1$s settings.', 'admin notice', - 'activitypub-event-bridge' + 'event-bridge-for-activitypub' ), esc_html( $activitypub_plugin_data['Name'] ), esc_html( $event_plugin_data['Name'] ), diff --git a/includes/admin/class-general-admin-notices.php b/includes/admin/class-general-admin-notices.php index 7ab1f2b..a58c2c4 100644 --- a/includes/admin/class-general-admin-notices.php +++ b/includes/admin/class-general-admin-notices.php @@ -4,12 +4,12 @@ * * Notices for guiding to proper configuration of this plugin. * - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @since 1.0.0 * @license AGPL-3.0-or-later */ -namespace ActivityPub_Event_Bridge\Admin; +namespace Event_Bridge_For_ActivityPub\Admin; // Exit if accessed directly. defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore @@ -29,7 +29,7 @@ class General_Admin_Notices { */ const ACTIVITYPUB_PLUGIN_URL = 'https://wordpress.org/plugins/activitypub'; - const ACTIVITYPUB_EVENT_BRIDGE_SUPPORTED_EVENT_PLUGINS_URL = 'https://code.event-federation.eu/Event-Federation/wordpress-activitypub-event-bridge#events-plugin-that-will-be-supported-at-first'; + const EVENT_BRIDGE_FOR_ACTIVITYPUB_SUPPORTED_EVENT_PLUGINS_URL = 'https://code.event-federation.eu/Event-Federation/wordpress-event-bridge-for-activitypub#events-plugin-that-will-be-supported-at-first'; /** * Allowed HTML for admin notices. @@ -54,9 +54,9 @@ class General_Admin_Notices { return sprintf( /* translators: 1: An URL that points to the ActivityPub plugin. */ _x( - 'For the ActivityPub Event Bridge to work, you will need to install and activate the ActivityPub plugin.', + 'For the Event Bridge for ActivityPub to work, you will need to install and activate the ActivityPub plugin.', 'admin notice', - 'activitypub-event-bridge' + 'event-bridge-for-activitypub' ), esc_html( self::ACTIVITYPUB_PLUGIN_URL ) ); @@ -71,12 +71,12 @@ class General_Admin_Notices { return sprintf( /* translators: 1: The name of the ActivityPub plugin. 2: The minimum required version number of the ActivityPub plugin. */ _x( - 'Please upgrade your ActivityPub plugin. At least version %2$s is required for the ActivityPub Event Bridge to work.', + 'Please upgrade your ActivityPub plugin. At least version %2$s is required for the Event Bridge for ActivityPub to work.', 'admin notice', - 'activitypub-event-bridge' + 'event-bridge-for-activitypub' ), esc_html( self::ACTIVITYPUB_PLUGIN_URL ), - esc_html( ACTIVITYPUB_EVENT_BRIDGE_ACTIVITYPUB_PLUGIN_MIN_VERSION ) + esc_html( EVENT_BRIDGE_FOR_ACTIVITYPUB_ACTIVITYPUB_PLUGIN_MIN_VERSION ) ); } @@ -89,12 +89,12 @@ class General_Admin_Notices { return sprintf( /* translators: 1: An URL to the list of supported event plugins. */ _x( - 'The Plugin ActivityPub Event Bridge is of no use, because you do not have installed and activated a supported Event Plugin. + 'The Plugin Event Bridge for ActivityPub is of no use, because you do not have installed and activated a supported Event Plugin.
For a list of supported Event Plugins see here.', 'admin notice', - 'activitypub-event-bridge' + 'event-bridge-for-activitypub' ), - esc_html( self::ACTIVITYPUB_EVENT_BRIDGE_SUPPORTED_EVENT_PLUGINS_URL ) + esc_html( self::EVENT_BRIDGE_FOR_ACTIVITYPUB_SUPPORTED_EVENT_PLUGINS_URL ) ); } @@ -107,12 +107,12 @@ class General_Admin_Notices { return sprintf( /* translators: 1: An URL to the list of supported event plugins. */ _x( - 'The Plugin ActivityPub Event Bridge is of no use, because you do not have installed and activated a supported Event Plugin. + 'The Plugin Event Bridge for ActivityPub is of no use, because you do not have installed and activated a supported Event Plugin.
For a list of supported Event Plugins see here.', 'admin notice', - 'activitypub-event-bridge' + 'event-bridge-for-activitypub' ), - esc_html( self::ACTIVITYPUB_EVENT_BRIDGE_SUPPORTED_EVENT_PLUGINS_URL ) + esc_html( self::EVENT_BRIDGE_FOR_ACTIVITYPUB_SUPPORTED_EVENT_PLUGINS_URL ) ); } diff --git a/includes/admin/class-health-check.php b/includes/admin/class-health-check.php index daaa0e0..61faa18 100644 --- a/includes/admin/class-health-check.php +++ b/includes/admin/class-health-check.php @@ -5,11 +5,11 @@ * @package Activitypub_Event_Bridge */ -namespace ActivityPub_Event_Bridge\Admin; +namespace Event_Bridge_For_ActivityPub\Admin; use Activitypub\Transformer\Factory as Transformer_Factory; -use ActivityPub_Event_Bridge\Plugins\Event_Plugin; -use ActivityPub_Event_Bridge\Setup; +use Event_Bridge_For_ActivityPub\Integrations\Event_Plugin; +use Event_Bridge_For_ActivityPub\Setup; use WP_Query; /** @@ -32,8 +32,8 @@ class Health_Check { * @return array The filtered test array. */ public static function add_tests( $tests ) { - $tests['direct']['activitypub_event_bridge_test'] = array( - 'label' => __( 'ActivityPub Event Transformer Test', 'activitypub-event-bridge' ), + $tests['direct']['event_bridge_for_activitypub_test'] = array( + 'label' => __( 'ActivityPub Event Transformer Test', 'event-bridge-for-activitypub' ), 'test' => array( self::class, 'test_event_transformation' ), ); @@ -47,15 +47,15 @@ class Health_Check { */ public static function test_event_transformation() { $result = array( - 'label' => \__( 'Transformation of Events to a valid ActivityStreams representation.', 'activitypub-event-bridge' ), + 'label' => \__( 'Transformation of Events to a valid ActivityStreams representation.', 'event-bridge-for-activitypub' ), 'status' => 'good', 'badge' => array( - 'label' => \__( 'ActivityPub Event Bridge', 'activitypub-event-bridge' ), + 'label' => \__( 'Event Bridge for ActivityPub', 'event-bridge-for-activitypub' ), 'color' => 'green', ), 'description' => \sprintf( '

%s

', - \__( 'The transformation of your most recent events was successful.', 'activitypub-event-bridge' ) + \__( 'The transformation of your most recent events was successful.', 'event-bridge-for-activitypub' ) ), 'actions' => '', 'test' => 'test_event_transformation', @@ -68,7 +68,7 @@ class Health_Check { } $result['status'] = 'critical'; - $result['label'] = \__( 'One or more of your most recent events failed to transform to ActivityPub', 'activitypub-event-bridge' ); + $result['label'] = \__( 'One or more of your most recent events failed to transform to ActivityPub', 'event-bridge-for-activitypub' ); $result['badge']['color'] = 'red'; $result['description'] = \sprintf( '

%s

', @@ -168,12 +168,12 @@ class Health_Check { * @return array The extended information. */ public static function add_debug_information( $info ) { - $info['activitypub_event_bridge'] = array( - 'label' => __( 'ActivityPub Event Bridge', 'activitypub-event-bridge' ), + $info['event_bridge_for_activitypub'] = array( + 'label' => __( 'Event Bridge for ActivityPub', 'event-bridge-for-activitypub' ), 'fields' => array( 'plugin_version' => array( - 'label' => __( 'Plugin Version', 'activitypub-event-bridge' ), - 'value' => ACTIVITYPUB_EVENT_BRIDGE_PLUGIN_VERSION, + 'label' => __( 'Plugin Version', 'event-bridge-for-activitypub' ), + 'value' => EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_VERSION, 'private' => true, ), 'active_event_plugins' => self::get_info_about_active_event_plugins(), diff --git a/includes/admin/class-settings-page.php b/includes/admin/class-settings-page.php index b2dbb3e..3a3903f 100644 --- a/includes/admin/class-settings-page.php +++ b/includes/admin/class-settings-page.php @@ -3,32 +3,32 @@ * General settings class. * * This file contains the General class definition, which handles the "General" settings - * page for the Activitypub Event Bridge Plugin, providing options for configuring various general settings. + * page for the Event Bridge for ActivityPub Plugin, providing options for configuring various general settings. * - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @since 1.0.0 */ -namespace ActivityPub_Event_Bridge\Admin; +namespace Event_Bridge_For_ActivityPub\Admin; // Exit if accessed directly. defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore -use ActivityPub_Event_Bridge\Plugins\Event_Plugin; -use ActivityPub_Event_Bridge\Setup; +use Event_Bridge_For_ActivityPub\Integrations\Event_Plugin; +use Event_Bridge_For_ActivityPub\Setup; /** - * Class responsible for the Activitypub Event Bridge related Settings. + * Class responsible for the Event Bridge for ActivityPub related Settings. * - * Class which handles the "General" settings page for the Activitypub Event Bridge Plugin, + * Class which handles the "General" settings page for the Event Bridge for ActivityPub Plugin, * providing options for configuring various general settings. * * @since 1.0.0 */ class Settings_Page { - const STATIC = 'ActivityPub_Event_Bridge\Admin\Settings_Page'; + const STATIC = 'Event_Bridge_For_ActivityPub\Admin\Settings_Page'; - const SETTINGS_SLUG = 'activitypub-event-bridge'; + const SETTINGS_SLUG = 'event-bridge-for-activitypub'; /** * Warning if the plugin is Active and the ActivityPub plugin is not. * @@ -36,8 +36,8 @@ class Settings_Page { */ public static function admin_menu(): void { \add_options_page( - 'Activitypub Event Bridge', - __( 'ActivityPub Event Bridge', 'activitypub-event-bridge' ), + 'Event Bridge for ActivityPub', + __( 'Event Bridge for ActivityPub', 'event-bridge-for-activitypub' ), 'manage_options', self::SETTINGS_SLUG, array( self::STATIC, 'settings_page' ), @@ -114,7 +114,7 @@ class Settings_Page { 'event_terms' => $event_terms, ); - \load_template( ACTIVITYPUB_EVENT_BRIDGE_PLUGIN_DIR . 'templates/settings.php', true, $args ); + \load_template( EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_DIR . 'templates/settings.php', true, $args ); break; case 'welcome': default: @@ -122,7 +122,7 @@ class Settings_Page { add_thickbox(); wp_enqueue_script( 'updates' ); - \load_template( ACTIVITYPUB_EVENT_BRIDGE_PLUGIN_DIR . 'templates/welcome.php', true ); + \load_template( EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_DIR . 'templates/welcome.php', true ); break; } } diff --git a/includes/class-autoloader.php b/includes/class-autoloader.php index e0315d8..40f99cd 100644 --- a/includes/class-autoloader.php +++ b/includes/class-autoloader.php @@ -1,17 +1,17 @@ 'string', - 'description' => \__( 'Define your own custom post template', 'activitypub-event-bridge' ), + 'description' => \__( 'Define your own custom post template', 'event-bridge-for-activitypub' ), 'show_in_rest' => true, 'default' => self::DEFAULT_EVENT_CATEGORY, 'sanitize_callback' => array( self::class, 'sanitize_mapped_event_category' ), @@ -52,22 +52,22 @@ class Settings { ); \register_setting( - 'activitypub-event-bridge', - 'activitypub_event_bridge_event_category_mappings', + 'event-bridge-for-activitypub', + 'event_bridge_for_activitypub_event_category_mappings', array( 'type' => 'array', - 'description' => \__( 'Define your own custom post template', 'activitypub-event-bridge' ), + 'description' => \__( 'Define your own custom post template', 'event-bridge-for-activitypub' ), 'default' => array(), 'sanitize_callback' => array( self::class, 'sanitize_event_category_mappings' ), ) ); \register_setting( - 'activitypub-event-bridge', - 'activitypub_event_bridge_initially_activated', + 'event-bridge-for-activitypub', + 'event_bridge_for_activitypub_initially_activated', array( 'type' => 'boolean', - 'description' => \__( 'Whether the plugin just got activated for the first time.', 'activitypub-event-bridge' ), + 'description' => \__( 'Whether the plugin just got activated for the first time.', 'event-bridge-for-activitypub' ), 'default' => 1, ) ); diff --git a/includes/class-setup.php b/includes/class-setup.php index b99eda5..ce6afc4 100644 --- a/includes/class-setup.php +++ b/includes/class-setup.php @@ -1,32 +1,32 @@ activitypub_plugin_is_active ) { - // deactivate_plugins( ACTIVITYPUB_EVENT_BRIDGE_PLUGIN_FILE ); + // deactivate_plugins( EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_FILE ); // return; // }. $this->active_event_plugins = self::detect_active_event_plugins(); @@ -125,15 +125,15 @@ class Setup { * @var array */ private const EVENT_PLUGIN_CLASSES = array( - '\ActivityPub_Event_Bridge\Plugins\Events_Manager', - '\ActivityPub_Event_Bridge\Plugins\GatherPress', - '\ActivityPub_Event_Bridge\Plugins\The_Events_Calendar', - '\ActivityPub_Event_Bridge\Plugins\VS_Event_List', - '\ActivityPub_Event_Bridge\Plugins\WP_Event_Manager', - '\ActivityPub_Event_Bridge\Plugins\Eventin', - '\ActivityPub_Event_Bridge\Plugins\Modern_Events_Calendar_Lite', - '\ActivityPub_Event_Bridge\Plugins\EventPrime', - '\ActivityPub_Event_Bridge\Plugins\Event_Organiser', + '\Event_Bridge_For_ActivityPub\Integrations\Events_Manager', + '\Event_Bridge_For_ActivityPub\Integrations\GatherPress', + '\Event_Bridge_For_ActivityPub\Integrations\The_Events_Calendar', + '\Event_Bridge_For_ActivityPub\Integrations\VS_Event_List', + '\Event_Bridge_For_ActivityPub\Integrations\WP_Event_Manager', + '\Event_Bridge_For_ActivityPub\Integrations\Eventin', + '\Event_Bridge_For_ActivityPub\Integrations\Modern_Events_Calendar_Lite', + '\Event_Bridge_For_ActivityPub\Integrations\EventPrime', + '\Event_Bridge_For_ActivityPub\Integrations\Event_Organiser', ); /** @@ -166,14 +166,14 @@ class Setup { * @return void */ protected function setup_hooks(): void { - register_activation_hook( ACTIVITYPUB_EVENT_BRIDGE_PLUGIN_FILE, array( $this, 'activate' ) ); + register_activation_hook( EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_FILE, array( $this, 'activate' ) ); add_action( 'admin_init', array( $this, 'do_admin_notices' ) ); add_action( 'admin_init', array( Settings::class, 'register_settings' ) ); add_action( 'admin_enqueue_scripts', array( self::class, 'enqueue_styles' ) ); add_action( 'admin_menu', array( Settings_Page::class, 'admin_menu' ) ); add_filter( - 'plugin_action_links_' . ACTIVITYPUB_EVENT_BRIDGE_PLUGIN_BASENAME, + 'plugin_action_links_' . EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_BASENAME, array( Settings_Page::class, 'settings_link' ) ); @@ -185,7 +185,7 @@ class Setup { add_action( 'init', array( Health_Check::class, 'init' ) ); // Check if the minimum required version of the ActivityPub plugin is installed. - if ( ! version_compare( $this->activitypub_plugin_version, ACTIVITYPUB_EVENT_BRIDGE_ACTIVITYPUB_PLUGIN_MIN_VERSION ) ) { + if ( ! version_compare( $this->activitypub_plugin_version, EVENT_BRIDGE_FOR_ACTIVITYPUB_ACTIVITYPUB_PLUGIN_MIN_VERSION ) ) { return; } @@ -200,24 +200,24 @@ class Setup { * @return void */ public static function enqueue_styles( $hook_suffix ): void { - if ( false !== strpos( $hook_suffix, 'activitypub-event-bridge' ) ) { + if ( false !== strpos( $hook_suffix, 'event-bridge-for-activitypub' ) ) { wp_enqueue_style( - 'activitypub-event-bridge-admin-styles', + 'event-bridge-for-activitypub-admin-styles', plugins_url( - 'assets/css/activitypub-event-bridge-admin.css', - ACTIVITYPUB_EVENT_BRIDGE_PLUGIN_FILE + 'assets/css/event-bridge-for-activitypub-admin.css', + EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_FILE ), array(), - ACTIVITYPUB_EVENT_BRIDGE_PLUGIN_VERSION + EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_VERSION ); wp_enqueue_script( - 'activitypub-event-bridge-admin-script', + 'event-bridge-for-activitypub-admin-script', plugins_url( - 'assets/js/activitypub-event-bridge-admin.js', - ACTIVITYPUB_EVENT_BRIDGE_PLUGIN_FILE + 'assets/js/event-bridge-for-activitypub-admin.js', + EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_FILE ), array( 'jquery' ), - ACTIVITYPUB_EVENT_BRIDGE_PLUGIN_VERSION, + EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_VERSION, false ); } @@ -233,15 +233,15 @@ class Setup { // Check if any general admin notices are needed and add actions to insert the needed admin notices. if ( ! $this->activitypub_plugin_is_active ) { // The ActivityPub plugin is not active. - add_action( 'admin_notices', array( 'ActivityPub_Event_Bridge\Admin\General_Admin_Notices', 'activitypub_plugin_not_enabled' ), 10, 1 ); + add_action( 'admin_notices', array( 'Event_Bridge_For_ActivityPub\Admin\General_Admin_Notices', 'activitypub_plugin_not_enabled' ), 10, 1 ); } - if ( ! version_compare( $this->activitypub_plugin_version, ACTIVITYPUB_EVENT_BRIDGE_ACTIVITYPUB_PLUGIN_MIN_VERSION ) ) { + if ( ! version_compare( $this->activitypub_plugin_version, EVENT_BRIDGE_FOR_ACTIVITYPUB_ACTIVITYPUB_PLUGIN_MIN_VERSION ) ) { // The ActivityPub plugin is too old. - add_action( 'admin_notices', array( 'ActivityPub_Event_Bridge\Admin\General_Admin_Notices', 'activitypub_plugin_version_too_old' ), 10, 1 ); + add_action( 'admin_notices', array( 'Event_Bridge_For_ActivityPub\Admin\General_Admin_Notices', 'activitypub_plugin_version_too_old' ), 10, 1 ); } if ( empty( $this->active_event_plugins ) ) { // No supported Event Plugin is active. - add_action( 'admin_notices', array( 'ActivityPub_Event_Bridge\Admin\General_Admin_Notices', 'no_supported_event_plugin_active' ), 10, 1 ); + add_action( 'admin_notices', array( 'Event_Bridge_For_ActivityPub\Admin\General_Admin_Notices', 'no_supported_event_plugin_active' ), 10, 1 ); } } @@ -294,9 +294,9 @@ class Setup { } /** - * Activates the ActivityPub Event Bridge plugin. + * Activates the Event Bridge for ActivityPub plugin. * - * This method handles the activation of the ActivityPub Event Bridge plugin. + * This method handles the activation of the Event Bridge for ActivityPub plugin. * * @since 1.0.0 * @see register_activation_hook() @@ -305,7 +305,7 @@ class Setup { public function activate(): void { // Don't allow plugin activation, when the ActivityPub plugin is not activated yet. if ( ! $this->activitypub_plugin_is_active ) { - deactivate_plugins( plugin_basename( ACTIVITYPUB_EVENT_BRIDGE_PLUGIN_FILE ) ); + deactivate_plugins( plugin_basename( EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_FILE ) ); $notice = General_Admin_Notices::get_admin_notice_activitypub_plugin_not_enabled(); wp_die( wp_kses( $notice, General_Admin_Notices::ALLOWED_HTML ), @@ -315,7 +315,7 @@ class Setup { } if ( empty( $this->active_event_plugins ) ) { - deactivate_plugins( plugin_basename( ACTIVITYPUB_EVENT_BRIDGE_PLUGIN_FILE ) ); + deactivate_plugins( plugin_basename( EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_FILE ) ); $notice = General_Admin_Notices::get_admin_notice_no_supported_event_plugin_active(); wp_die( wp_kses( $notice, General_Admin_Notices::ALLOWED_HTML ), diff --git a/includes/event-categories.php b/includes/event-categories.php index 6350a52..15fbdcf 100644 --- a/includes/event-categories.php +++ b/includes/event-categories.php @@ -2,46 +2,46 @@ /** * File responsible for defining the event category strings. * - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @since 1.0.0 * @license AGPL-3.0-or-later */ -namespace ActivityPub_Event_Bridge; +namespace Event_Bridge_For_ActivityPub; define( - 'ACTIVITYPUB_EVENT_BRIDGE_EVENT_CATEGORIES', + 'EVENT_BRIDGE_FOR_ACTIVITYPUB_EVENT_CATEGORIES', array( - 'ARTS' => __( 'Arts', 'activitypub-event-bridge' ), - 'BOOK_CLUBS' => __( 'Book clubs', 'activitypub-event-bridge' ), - 'BUSINESS' => __( 'Business', 'activitypub-event-bridge' ), - 'CAUSES' => __( 'Causes', 'activitypub-event-bridge' ), - 'COMEDY' => __( 'Comedy', 'activitypub-event-bridge' ), - 'CRAFTS' => __( 'Crafts', 'activitypub-event-bridge' ), - 'FOOD_DRINK' => __( 'Food & Drink', 'activitypub-event-bridge' ), - 'HEALTH' => __( 'Health', 'activitypub-event-bridge' ), - 'MUSIC' => __( 'Music', 'activitypub-event-bridge' ), - 'AUTO_BOAT_AIR' => __( 'Auto, boat and air', 'activitypub-event-bridge' ), - 'COMMUNITY' => __( 'Community', 'activitypub-event-bridge' ), - 'FAMILY_EDUCATION' => __( 'Family & Education', 'activitypub-event-bridge' ), - 'FASHION_BEAUTY' => __( 'Fashion & Beauty', 'activitypub-event-bridge' ), - 'FILM_MEDIA' => __( 'Film & Media', 'activitypub-event-bridge' ), - 'GAMES' => __( 'Games', 'activitypub-event-bridge' ), - 'LANGUAGE_CULTURE' => __( 'Language & Culture', 'activitypub-event-bridge' ), - 'LEARNING' => __( 'Learning', 'activitypub-event-bridge' ), - 'LGBTQ' => __( 'LGBTQ', 'activitypub-event-bridge' ), - 'MOVEMENTS_POLITICS' => __( 'Movements and politics', 'activitypub-event-bridge' ), - 'NETWORKING' => __( 'Networking', 'activitypub-event-bridge' ), - 'PARTY' => __( 'Party', 'activitypub-event-bridge' ), - 'PERFORMING_VISUAL_ARTS' => __( 'Performing & Visual Arts', 'activitypub-event-bridge' ), - 'PETS' => __( 'Pets', 'activitypub-event-bridge' ), - 'PHOTOGRAPHY' => __( 'Photography', 'activitypub-event-bridge' ), - 'OUTDOORS_ADVENTURE' => __( 'Outdoors & Adventure', 'activitypub-event-bridge' ), - 'SPIRITUALITY_RELIGION_BELIEFS' => __( 'Spirituality, Religion & Beliefs', 'activitypub-event-bridge' ), - 'SCIENCE_TECH' => __( 'Science & Tech', 'activitypub-event-bridge' ), - 'SPORTS' => __( 'Sports', 'activitypub-event-bridge' ), - 'THEATRE' => __( 'Theatre', 'activitypub-event-bridge' ), - 'MEETING' => __( 'Meeting', 'activitypub-event-bridge' ), // Default value in federation. - 'DEFAULT' => __( 'Default', 'activitypub-event-bridge' ), // Internal default for overrides. + 'ARTS' => __( 'Arts', 'event-bridge-for-activitypub' ), + 'BOOK_CLUBS' => __( 'Book clubs', 'event-bridge-for-activitypub' ), + 'BUSINESS' => __( 'Business', 'event-bridge-for-activitypub' ), + 'CAUSES' => __( 'Causes', 'event-bridge-for-activitypub' ), + 'COMEDY' => __( 'Comedy', 'event-bridge-for-activitypub' ), + 'CRAFTS' => __( 'Crafts', 'event-bridge-for-activitypub' ), + 'FOOD_DRINK' => __( 'Food & Drink', 'event-bridge-for-activitypub' ), + 'HEALTH' => __( 'Health', 'event-bridge-for-activitypub' ), + 'MUSIC' => __( 'Music', 'event-bridge-for-activitypub' ), + 'AUTO_BOAT_AIR' => __( 'Auto, boat and air', 'event-bridge-for-activitypub' ), + 'COMMUNITY' => __( 'Community', 'event-bridge-for-activitypub' ), + 'FAMILY_EDUCATION' => __( 'Family & Education', 'event-bridge-for-activitypub' ), + 'FASHION_BEAUTY' => __( 'Fashion & Beauty', 'event-bridge-for-activitypub' ), + 'FILM_MEDIA' => __( 'Film & Media', 'event-bridge-for-activitypub' ), + 'GAMES' => __( 'Games', 'event-bridge-for-activitypub' ), + 'LANGUAGE_CULTURE' => __( 'Language & Culture', 'event-bridge-for-activitypub' ), + 'LEARNING' => __( 'Learning', 'event-bridge-for-activitypub' ), + 'LGBTQ' => __( 'LGBTQ', 'event-bridge-for-activitypub' ), + 'MOVEMENTS_POLITICS' => __( 'Movements and politics', 'event-bridge-for-activitypub' ), + 'NETWORKING' => __( 'Networking', 'event-bridge-for-activitypub' ), + 'PARTY' => __( 'Party', 'event-bridge-for-activitypub' ), + 'PERFORMING_VISUAL_ARTS' => __( 'Performing & Visual Arts', 'event-bridge-for-activitypub' ), + 'PETS' => __( 'Pets', 'event-bridge-for-activitypub' ), + 'PHOTOGRAPHY' => __( 'Photography', 'event-bridge-for-activitypub' ), + 'OUTDOORS_ADVENTURE' => __( 'Outdoors & Adventure', 'event-bridge-for-activitypub' ), + 'SPIRITUALITY_RELIGION_BELIEFS' => __( 'Spirituality, Religion & Beliefs', 'event-bridge-for-activitypub' ), + 'SCIENCE_TECH' => __( 'Science & Tech', 'event-bridge-for-activitypub' ), + 'SPORTS' => __( 'Sports', 'event-bridge-for-activitypub' ), + 'THEATRE' => __( 'Theatre', 'event-bridge-for-activitypub' ), + 'MEETING' => __( 'Meeting', 'event-bridge-for-activitypub' ), // Default value in federation. + 'DEFAULT' => __( 'Default', 'event-bridge-for-activitypub' ), // Internal default for overrides. ), ); diff --git a/includes/plugins/class-event-organiser.php b/includes/integrations/class-event-organiser.php similarity index 93% rename from includes/plugins/class-event-organiser.php rename to includes/integrations/class-event-organiser.php index d418bba..9278f43 100644 --- a/includes/plugins/class-event-organiser.php +++ b/includes/integrations/class-event-organiser.php @@ -5,11 +5,11 @@ * Defines all the necessary meta information for the Event Organiser plugin. * * @link https://wordpress.org/plugins/event-organiser/ - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @since 1.0.0 */ -namespace ActivityPub_Event_Bridge\Plugins; +namespace Event_Bridge_For_ActivityPub\Integrations; // Exit if accessed directly. defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore diff --git a/includes/plugins/class-event-plugin.php b/includes/integrations/class-event-plugin.php similarity index 89% rename from includes/plugins/class-event-plugin.php rename to includes/integrations/class-event-plugin.php index a5c5734..56d020a 100644 --- a/includes/plugins/class-event-plugin.php +++ b/includes/integrations/class-event-plugin.php @@ -4,13 +4,13 @@ * * Basic information that each supported event needs for this plugin to work. * - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @since 1.0.0 */ -namespace ActivityPub_Event_Bridge\Plugins; +namespace Event_Bridge_For_ActivityPub\Integrations; -use ActivityPub_Event_Bridge\Activitypub\Transformer\Event as Event_Transformer; +use Event_Bridge_For_ActivityPub\Activitypub\Transformer\Event as Event_Transformer; // Exit if accessed directly. defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore @@ -83,6 +83,6 @@ abstract class Event_Plugin { * Returns the Activitypub transformer for the event plugins event post type. */ public static function get_activitypub_event_transformer_class(): string { - return str_replace( 'Plugins', 'Activitypub\Transformer', static::class ); + return str_replace( 'Integrations', 'Activitypub\Transformer', static::class ); } } diff --git a/includes/plugins/class-eventin.php b/includes/integrations/class-eventin.php similarity index 92% rename from includes/plugins/class-eventin.php rename to includes/integrations/class-eventin.php index 6584e85..6ce88a6 100644 --- a/includes/plugins/class-eventin.php +++ b/includes/integrations/class-eventin.php @@ -5,11 +5,11 @@ * Defines all the necessary meta information for the events calendar. * * @link https://wordpress.org/plugins/the-events-calendar/ - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @since 1.0.0 */ -namespace ActivityPub_Event_Bridge\Plugins; +namespace Event_Bridge_For_ActivityPub\Integrations; // Exit if accessed directly. defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore diff --git a/includes/plugins/class-eventprime.php b/includes/integrations/class-eventprime.php similarity index 98% rename from includes/plugins/class-eventprime.php rename to includes/integrations/class-eventprime.php index e5fb8d6..af78347 100644 --- a/includes/plugins/class-eventprime.php +++ b/includes/integrations/class-eventprime.php @@ -3,11 +3,11 @@ * EventPrime – Events Calendar, Bookings and Tickets * * @link https://wordpress.org/plugins/eventprime-event-calendar-management/ - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @since 1.0.0 */ -namespace ActivityPub_Event_Bridge\Plugins; +namespace Event_Bridge_For_ActivityPub\Integrations; use Activitypub\Signature; use Eventprime_Basic_Functions; diff --git a/includes/plugins/class-events-manager.php b/includes/integrations/class-events-manager.php similarity index 93% rename from includes/plugins/class-events-manager.php rename to includes/integrations/class-events-manager.php index 02ca060..2f22620 100644 --- a/includes/plugins/class-events-manager.php +++ b/includes/integrations/class-events-manager.php @@ -5,11 +5,11 @@ * Defines all the necessary meta information for the Events Manager WordPress Plugin. * * @link https://wordpress.org/plugins/events-manager/ - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @since 1.0.0 */ -namespace ActivityPub_Event_Bridge\Plugins; +namespace Event_Bridge_For_ActivityPub\Integrations; // Exit if accessed directly. defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore diff --git a/includes/plugins/class-gatherpress.php b/includes/integrations/class-gatherpress.php similarity index 94% rename from includes/plugins/class-gatherpress.php rename to includes/integrations/class-gatherpress.php index 6c6af0f..57cd222 100644 --- a/includes/plugins/class-gatherpress.php +++ b/includes/integrations/class-gatherpress.php @@ -5,11 +5,11 @@ * Defines all the necessary meta information for the GatherPress plugin. * * @link https://wordpress.org/plugins/gatherpress/ - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @since 1.0.0 */ -namespace ActivityPub_Event_Bridge\Plugins; +namespace Event_Bridge_For_ActivityPub\Integrations; // Exit if accessed directly. defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore diff --git a/includes/plugins/class-modern-events-calendar-lite.php b/includes/integrations/class-modern-events-calendar-lite.php similarity index 93% rename from includes/plugins/class-modern-events-calendar-lite.php rename to includes/integrations/class-modern-events-calendar-lite.php index 45f060f..02329ae 100644 --- a/includes/plugins/class-modern-events-calendar-lite.php +++ b/includes/integrations/class-modern-events-calendar-lite.php @@ -5,11 +5,11 @@ * Defines all the necessary meta information for the Modern Events Calendar (Lite). * * @link https://webnus.net/modern-events-calendar/ - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @since 1.0.0 */ -namespace ActivityPub_Event_Bridge\Plugins; +namespace Event_Bridge_For_ActivityPub\Integrations; // Exit if accessed directly. defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore diff --git a/includes/plugins/class-the-events-calendar.php b/includes/integrations/class-the-events-calendar.php similarity index 94% rename from includes/plugins/class-the-events-calendar.php rename to includes/integrations/class-the-events-calendar.php index 36ab8e0..42d295e 100644 --- a/includes/plugins/class-the-events-calendar.php +++ b/includes/integrations/class-the-events-calendar.php @@ -5,11 +5,11 @@ * Defines all the necessary meta information for the events calendar. * * @link https://wordpress.org/plugins/the-events-calendar/ - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @since 1.0.0 */ -namespace ActivityPub_Event_Bridge\Plugins; +namespace Event_Bridge_For_ActivityPub\Integrations; // Exit if accessed directly. defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore diff --git a/includes/plugins/class-vs-event-list.php b/includes/integrations/class-vs-event-list.php similarity index 90% rename from includes/plugins/class-vs-event-list.php rename to includes/integrations/class-vs-event-list.php index f1bd96b..6ce4ba6 100644 --- a/includes/plugins/class-vs-event-list.php +++ b/includes/integrations/class-vs-event-list.php @@ -6,13 +6,13 @@ * "Very Simple Events List". * * @link https://de.wordpress.org/plugins/very-simple-event-list/ - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @since 1.0.0 */ -namespace ActivityPub_Event_Bridge\Plugins; +namespace Event_Bridge_For_ActivityPub\Integrations; -use ActivityPub_Event_Bridge\Event_Plugins; +use Event_Bridge_For_ActivityPub\Event_Plugins; // Exit if accessed directly. defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore diff --git a/includes/plugins/class-wp-event-manager.php b/includes/integrations/class-wp-event-manager.php similarity index 90% rename from includes/plugins/class-wp-event-manager.php rename to includes/integrations/class-wp-event-manager.php index 28a852a..18c217d 100644 --- a/includes/plugins/class-wp-event-manager.php +++ b/includes/integrations/class-wp-event-manager.php @@ -6,13 +6,13 @@ * "WP Event Manager" * * @link https://de.wordpress.org/plugins/wp-event-manager - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub * @since 1.0.0 */ -namespace ActivityPub_Event_Bridge\Plugins; +namespace Event_Bridge_For_ActivityPub\Integrations; -use ActivityPub_Event_Bridge\Plugins\Event_Plugin; +use Event_Bridge_For_ActivityPub\Integrations\Event_Plugin; // Exit if accessed directly. defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore diff --git a/package.json b/package.json index 4db7d96..68b7757 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "activitypub-event-bridge", + "name": "event-bridge-for-activitypub", "version": "0.1.0", "author": { "name": "André Menrath", @@ -15,7 +15,7 @@ }, "license": "AGPL-3.0", "bugs": { - "url": "https://code.event-federation.eu/Event-Federation/wordpress-activitypub-event-bridge/issues" + "url": "https://code.event-federation.eu/Event-Federation/wordpress-event-bridge-for-activitypub/issues" }, "devDependencies": { "@wordpress/env": "^10.10.0", diff --git a/phpcs.xml b/phpcs.xml index e1ef42c..7839664 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -108,7 +108,7 @@ - + @@ -117,7 +117,7 @@ - + diff --git a/readme.txt b/readme.txt index e581fcb..35cf32b 100644 --- a/readme.txt +++ b/readme.txt @@ -1,4 +1,4 @@ -=== ActivityPub Event Bridge === +=== Event Bridge for ActivityPub === Contributors: andremenrath Tags: events, fediverse, activitypub, calendar Requires at least: 6.5 @@ -12,7 +12,7 @@ Integrating popular event plugins with the ActivityPub plugin. == Description == Make your events more discoverable, expand your reach effortlessly while being independent of other (commercial) platforms, and be a part of the growing decentralized web (the Fediverse). -With the ActivityPub Event Bridge Plugin for WordPress, your events can be automatically followed, aggregated and displayed across decentralized platforms like [Mastodon](https://joinmastodon.org) or [Gancio](https://gancio.org), without any extra work. +With the Event Bridge for ActivityPub Plugin for WordPress, your events can be automatically followed, aggregated and displayed across decentralized platforms like [Mastodon](https://joinmastodon.org) or [Gancio](https://gancio.org), without any extra work. Forget the hassle of managing multiple social media accounts just to keep your audience informed. This plugin is not an event managing plugin but an add-on to popular event plugins. It extends their functionality to fully support the [ActivityPub plugin](https://wordpress.org/plugins/activitypub/). @@ -21,7 +21,7 @@ You retain full ownership of your content. By integrating into your existing set = How It Works = -With the ActivityPub Event Bridge WordPress plugin, sharing your events is effortless and automatic! +With the Event Bridge for ActivityPub WordPress plugin, sharing your events is effortless and automatic! Once you create an event on your WordPress site, it is seamlessly shared across the decentralized web using the ActivityPub protocol. ![](./.wordpress-org/event-activitypub-publishing.gif) @@ -88,11 +88,11 @@ No, the Event Federation Plugin depends on the [ActivityPub plugin](https://word = My event plugin is not supported, what can I do? = -If you know about coding have a look at the documentation of how to add your plugin or open an [issue](https://code.event-federation.eu/Event-Federation/wordpress-activitypub-event-bridge/issues), if we can spare some free hours we might add it. +If you know about coding have a look at the documentation of how to add your plugin or open an [issue](https://code.event-federation.eu/Event-Federation/wordpress-event-bridge-for-activitypub/issues), if we can spare some free hours we might add it. = What if I experience problems? = -We're always interested in your feedback. Feel free to reach out to us via [E-Mail](https://event-federation.eu/contact/) or create an [issue](https://code.event-federation.eu/Event-Federation/wordpress-activitypub-event-bridge/issues). +We're always interested in your feedback. Feel free to reach out to us via [E-Mail](https://event-federation.eu/contact/) or create an [issue](https://code.event-federation.eu/Event-Federation/wordpress-event-bridge-for-activitypub/issues). == Changelog == diff --git a/templates/admin-header.php b/templates/admin-header.php index 4ee283b..4c84ff2 100644 --- a/templates/admin-header.php +++ b/templates/admin-header.php @@ -2,7 +2,7 @@ /** * Template for the header and navigation of the admin pages. * - * @package ActivityPub_Event_Bridge + * @package Event_Bridge_For_ActivityPub */ // Exit if accessed directly. @@ -18,18 +18,18 @@ $args = wp_parse_args( ); ?> -
-
-

+
+
+

-
diff --git a/templates/settings.php b/templates/settings.php index 309590f..a0ddab4 100644 --- a/templates/settings.php +++ b/templates/settings.php @@ -1,10 +1,10 @@ -
+
- +
-

-

+

+

- +
- '; $label ) { + foreach ( EVENT_BRIDGE_FOR_ACTIVITYPUB_EVENT_CATEGORIES as $value => $label ) { echo ''; } ?> @@ -62,14 +62,14 @@ $current_category_mapping = \get_option( 'activitypub_event_bridge_event_
-

-

+

+

name ); ?> - -- ' . esc_html( ACTIVITYPUB_EVENT_BRIDGE_EVENT_CATEGORIES[ $mapping ] ) . ' -- '; + echo ''; } else { - echo ''; + echo ''; } - echo ''; + echo ''; foreach ( Event::DEFAULT_EVENT_CATEGORIES as $event_category ) { - echo ''; + echo ''; } ?> @@ -99,7 +99,7 @@ $current_category_mapping = \get_option( 'activitypub_event_bridge_event_ diff --git a/templates/welcome.php b/templates/welcome.php index cb63f5c..503df4f 100644 --- a/templates/welcome.php +++ b/templates/welcome.php @@ -1,16 +1,16 @@ get_active_event_plugins(); -$activitypub_event_bridge_status_ok = true; -$example_event_post = Health_Check::get_most_recent_event_posts(); +$active_event_plugins = Setup::get_instance()->get_active_event_plugins(); +$event_bridge_for_activitypub_status_ok = true; +$example_event_post = Health_Check::get_most_recent_event_posts(); if ( empty( $example_event_post ) ) { $example_event_post = 'https://yoursite.com/events/event-name'; @@ -37,13 +37,13 @@ WP_Filesystem(); ?> -
+
-

-

+

+

get_plugin_name() ); ?>:

-
    +
    • %2$s is enabled in the %1$s settings.', 'admin notice', - 'activitypub-event-bridge' + 'event-bridge-for-activitypub' ), esc_html( get_plugin_data( ACTIVITYPUB_PLUGIN_FILE )['Name'] ), esc_html( $active_event_plugin->get_plugin_name() ), admin_url( 'options-general.php?page=activitypub&tab=settings' ) ); } else { - $activitypub_event_bridge_status_ok = false; + $event_bridge_for_activitypub_status_ok = false; echo '❌ '; $status_message_post_type_enabled = sprintf( /* translators: 1: the name of the event plugin a admin notice is shown. 2: The name of the ActivityPub plugin. */ _x( 'The post type for events of the plugin %2$s is not enabled in the %1$s settings.', 'admin notice', - 'activitypub-event-bridge' + 'event-bridge-for-activitypub' ), esc_html( get_plugin_data( ACTIVITYPUB_PLUGIN_FILE )['Name'] ), esc_html( $active_event_plugin->get_plugin_name() ), @@ -89,11 +89,11 @@ WP_Filesystem();
      • @@ -101,95 +101,95 @@ WP_Filesystem();
- +
-

+

' . \esc_html__( 'Please fix the status issues above first.', 'activitypub-event-bridge' ) . '

'; + if ( ! $event_bridge_for_activitypub_status_ok ) { + echo '

' . \esc_html__( 'Please fix the status issues above first.', 'event-bridge-for-activitypub' ) . '

'; } ?> -

-
-

-

-