Merge branch 'main' into join_ignore

* Only use unicode characters
* Fix image paths

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).
 
+## [0.3.5] - 2025-01-03
+
+### Fixed
+
+* Images of Acknowledgements in Admin UI
+
 ## [0.3.4] - 2024-12-21
 
 * Initial release on WordPress.org

README.md

@@ -3,7 +3,11 @@
 **Tags:** events, fediverse, activitypub, calendar  
 **Requires at least:** 6.5  
 **Tested up to:** 6.7  
+<<<<<<< HEAD
 **Stable tag:** 0.3.4  
+=======
+**Stable tag:** 0.3.5  
+>>>>>>> 4dd1d56daa487caa56755e874dd7e74995f0340a
 **Requires PHP:** 7.4  
 **License:** AGPL-3.0-or-later  
 **License URI:** https://www.gnu.org/licenses/agpl-3.0.html  
@@ -101,13 +105,13 @@ We're always interested in your feedback. Feel free to reach out to us via [E-Ma
 
 ## Acknowledgement
 
-[<img src="./.wordpress-org/acknowledgement-NLnet.svg" alt="NLnet foundation logo" width="20%" style="margin: 10px 5% 10px 5%;"/>](https://nlnet.nl)
+<<<<<<< HEAD
-[<img src="./.wordpress-org/acknowledgement-NGI0Entrust.svg" alt="NGI Zero Logo" width="20%" style="margin: 10px 5% 10px 5%;"/>](https://nlnet.nl/entrust)
-
-The development of this WordPress plugin was funded through the [NGI0 Entrust](https://NLnet.nl/entrust) Fund, a fund established by [NLnet](https://nlnet.nl) with financial support from the European Commission's [Next Generation Internet](https://ngi.eu) programme, under the aegis of [Communications Networks, Content and Technology](https://commission.europa.eu/about-european-commission/departments-and-executive-agencies/communications-networks-content-and-technology_en) under grant agreement number 101069594.
-
-## Changelog ##
-
 ### [0.3.4] 2024-12-21 ###
 
 * Initial release on https://wordpress.org/
+=======
+[<img src="./assets/img/acknowledgement-NLnet.svg" alt="NLnet foundation logo" width="20%" style="margin: 10px 5% 10px 5%;"/>](https://nlnet.nl)
+[<img src="./assets/img/acknowledgement-NGI0Entrust.svg" alt="NGI Zero Logo" width="20%" style="margin: 10px 5% 10px 5%;"/>](https://nlnet.nl/entrust)
+
+The development of this WordPress plugin was funded through the [NGI0 Entrust](https://NLnet.nl/entrust) Fund, a fund established by [NLnet](https://nlnet.nl) with financial support from the European Commission's [Next Generation Internet](https://ngi.eu) programme, under the aegis of [Communications Networks, Content and Technology](https://commission.europa.eu/about-european-commission/departments-and-executive-agencies/communications-networks-content-and-technology_en) under grant agreement number 101069594.
+>>>>>>> 4dd1d56daa487caa56755e874dd7e74995f0340a

event-bridge-for-activitypub.php

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

includes/activitypub/handler/class-join.php

@@ -31,7 +31,7 @@ class Join {
 		);
 
 		\add_action(
-			'activitypub_event_bridge_ignore_join',
+			'event_bridge_for_activitypub_ignore_join',
 			array( self::class, 'send_ignore_response' ),
 			10,
 			4
@@ -81,7 +81,7 @@ class Join {
 		// Until then just send an ignore.
 
 		do_action(
-			'activitypub_event_bridge_ignore_join',
+			'event_bridge_for_activitypub_ignore_join',
 			$transformer->get_actor_object()->get_id(),
 			$activity,
 		);
@@ -90,9 +90,9 @@ class Join {
 	/**
 	 * Send "Ignore" response.
 	 *
-	 * @param string  $actor            The actors ActivityPub ID which sends the response.
+	 * @param string $actor           The actors ActivityPub ID which sends the response.
-	 * @param array   $activity_object  The Activity object that gets ignored.
+	 * @param array  $activity_object The Activity object that gets ignored.
-	 * @param string  $to               The target actor.
+	 * @param string $to              The target actor.
 	 */
 	public static function send_ignore_response( $actor, $activity_object, $to = null ) {
 		if ( ! $to && array_key_exists( 'actor', $activity_object ) ) {

readme.txt

@@ -3,7 +3,11 @@ Contributors: andremenrath
 Tags: events, fediverse, activitypub, calendar
 Requires at least: 6.5
 Tested up to: 6.7
+<<<<<<< HEAD
 Stable tag: 0.3.4
+=======
+Stable tag: 0.3.5
+>>>>>>> 4dd1d56daa487caa56755e874dd7e74995f0340a
 Requires PHP: 7.4
 License: AGPL-3.0-or-later
 License URI: https://www.gnu.org/licenses/agpl-3.0.html
@@ -65,7 +69,7 @@ This plugin depends on the [ActivityPub plugin](https://wordpress.org/plugins/ac
 
 = Configuration =
 
-If you're new to the [ActivityPub plugin](https://wordpress.org/plugins/activitypub/), it’s recommended to spend a few minutes reading through its documentation to familiarize yourself with its setup and functionality.
+If you're new to the [ActivityPub plugin](https://wordpress.org/plugins/activitypub/), it's recommended to spend a few minutes reading through its documentation to familiarize yourself with its setup and functionality.
 
 == Frequently Asked Questions ==
 
@@ -103,6 +107,10 @@ The development of this WordPress plugin was funded through the [NGI0 Entrust](h
 
 == Changelog ==
 
+= [0.3.5] - 2025-01-03 =
+
+* Fixed: Images of Acknowledgements in Admin UI
+
 = [0.3.4] 2024-12-21 =
 
 * Initial release on https://wordpress.org/

templates/welcome.php

@@ -231,7 +231,7 @@ WP_Filesystem();
 
 	<div class="box">
 		<h2><?php \esc_html_e( 'Acknowledgement', 'event-bridge-for-activitypub' ); ?></h2>
-		<p><a href="https://NLnet.nl"><img src="<?php echo esc_url( plugins_url( '/.wordpress-org/acknowledgement-NLnet.svg', EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_FILE ) ); ?>" alt="Logo NLnet: abstract logo of four people seen from above" class="logo-center"></a> <a href="https://NLnet.nl/NGI0"><img src="<?php echo esc_url( plugins_url( '/.wordpress-org/acknowledgement-NGI0Entrust.svg', EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_FILE ) ); ?>" alt="Logo NGI Zero: letterlogo shaped like a tag" class="logo-center"> </a></p>
+		<p><a href="https://NLnet.nl"><img src="<?php echo esc_url( plugins_url( '/assets/img/acknowledgement-NLnet.svg', EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_FILE ) ); ?>" alt="Logo NLnet: abstract logo of four people seen from above" class="logo-center"></a> <a href="https://NLnet.nl/NGI0"><img src="<?php echo esc_url( plugins_url( '/assets/img/acknowledgement-NGI0Entrust.svg', EVENT_BRIDGE_FOR_ACTIVITYPUB_PLUGIN_FILE ) ); ?>" alt="Logo NGI Zero: letterlogo shaped like a tag" class="logo-center"> </a></p>
 		<p>The development of this plugin was funded through the <a href="https://NLnet.nl/entrust">NGI0 Entrust</a> Fund, a fund established by <a href="https://nlnet.nl">NLnet</a> with financial support from the European Commission's <a href="https://ngi.eu">Next Generation Internet</a> programme, under the aegis of <a href="https://commission.europa.eu/about-european-commission/departments-and-executive-agencies/communications-networks-content-and-technology_en">DG Communications Networks, Content and Technology</a> under grant agreement N<sup>o</sup> 101069594.</p>
 	</div>
 	<?php endif; ?>