Merge remote-tracking branch 'origin/develop' into add/donation-widget-license-pages-develop

Author: nickpagz

.gitignore

@@ -16,8 +16,11 @@ plugins/*
 
 mu-plugins/*
 !mu-plugins/mu-autoloader.php
+!mu-plugins/activitypub-migration.php
 !mu-plugins/osi-event-list
 !mu-plugins/osi-sponsors-list
+!websub-compat.php
+!mu-plugins/osi-events-manager-tweaks
 
 themes/*
 !themes/osi

mu-plugins/activitypub-migration.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * Plugin Name: ActivityPub Migration
+ * Plugin Description: Adds the `blog.opensource.org` to the Actors `alsoKnownAs` list.
+ * Version: 1.0.0
+ * Author: WordPress.com Special Projects
+ * Author URI: https://wpspecialprojects.wordpress.com/
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	return;
+}
+
+/**
+ * Adds the `blog.opensource.org` to the Actors `alsoKnownAs` list.
+ *
+ * @param array $actor Actor as Array.
+ *
+ * @return array $actor Filtered Actor Array.
+ */
+function activitypub_actor_migration( array $actor ) {
+	if ( ! $actor ) {
+		return $actor;
+	}
+
+	$host = wp_parse_url( get_home_url(), PHP_URL_HOST );
+	$id   = str_replace( $host, 'blog.' . $host, $actor['id'] );
+	$id   = str_replace( '/blog/', '/', $id );
+
+	$actor['alsoKnownAs'] = array( $id );
+	return $actor;
+}
+add_filter( 'activitypub_activity_user_object_array', 'activitypub_actor_migration' );
+add_filter( 'activitypub_activity_blog_user_object_array', 'activitypub_actor_migration' );

mu-plugins/osi-events-manager-tweaks/osi-events-manager-tweaks.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Plugin Name: OSI Events Manager Tweaks
+ * Description: Customizations for the Events Manager plugin.
+ * Version: 1.0.0
+ * Author: WordPress.com Special Projects
+ * Author URI: https://wpspecialprojects.wordpress.com/
+ */
+
+ /**
+ * Remove the event time zone if the event is all day.
+ *
+ * @param string $replace         The string to replace.
+ * @param EM_Event $EM_Event      The event object.
+ * @param string $full_result     The full result.
+ * @param string $target          The target.
+ * @param array $placeholder_atts The placeholder attributes.
+ *
+ * @return string
+*/
+function osi_em_event_output_placeholder( $replace, $EM_Event, $full_result, $target, $placeholder_atts ) {
+	if ( '#_EVENTTIMEZONE' === $full_result ) {
+		$event_times = $EM_Event->output('#_EVENTTIMES');
+		if ( 'All Day' === $event_times ) {
+			$replace = '';
+		}
+	}
+	return $replace;
+}
+add_filter('em_event_output_placeholder', 'osi_em_event_output_placeholder', 10, 5);
+
+/**
+ * Display "Free" for events with a price of 0.00.
+ *
+ * @param string $formatted_price The formatted price.
+ * @param string $price           The price.
+ * @param string $currency        The currency.
+ * @param string $format          The format.
+ * @return void
+ */
+function osi_format_event_manager_price( $formatted_price, $price, $currency, $format ) {
+	if( 0.00 === (float)$price ) {
+		$formatted_price = 'Free';
+	}
+
+	return $formatted_price;
+}
+add_filter('em_get_currency_formatted', 'osi_format_event_manager_price', 10, 4 );

mu-plugins/websub-compat.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * Plugin Name: WebSub Backwards Compatibility
+ * Plugin Description: Still send pings for the old `blog.opensource.org` Feed-URLs.
+ * Version: 1.0.0
+ * Author: WordPress.com Special Projects
+ * Author URI: https://wpspecialprojects.wordpress.com/
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	return;
+}
+
+/**
+ * Filter `pubsubhubbub_feed_urls` and `pubsubhubbub_comment_feed_urls`.
+ *
+ * Still send pings for the old `blog.opensource.org` Feed-URLs.
+ *
+ * @param array $links Array of Feed URLs.
+ *
+ * @return array $links Array of filtered Feed URLs.
+ */
+function websub_compat( array $links ) {
+	if ( ! $links ) {
+		return $links;
+	}
+
+	$host         = wp_parse_url( get_home_url(), PHP_URL_HOST );
+	$compat_links = array();
+
+	foreach ( $links as $link ) {
+		$compat_links[] = str_replace( $host, 'blog.' . $host, $link );
+	}
+
+	return array_unique( array_merge( $links, $compat_links ) );
+}
+add_filter( 'pubsubhubbub_feed_urls', 'websub_compat' );
+add_filter( 'pubsubhubbub_comment_feed_urls', 'websub_compat' );

plugins/osi-features/inc/classes/post-types/class-base.php

@@ -79,6 +79,10 @@ public function get_args() {
 			'has_archive'   => true,
 			'menu_position' => 6,
 			'supports'      => [ 'title', 'editor', 'author', 'thumbnail', 'excerpt', 'comments' ],
+			'rewrite'            => array(
+				'slug'       => $this->get_slug(),
+				'with_front' => false,
+			)
 		];
 
 	}

plugins/osi-features/inc/classes/post-types/class-post-type-press-mentions.php

@@ -62,7 +62,7 @@ public function get_args() {
 			'has_archive'   => true,
 			'menu_position' => 6,
 			'supports'      => [ 'title', 'author', 'excerpt' ],
-			'rewrite'       => [ 'slug' => 'press-mentions' ]
+			'rewrite'       => [ 'slug' => 'press-mentions', 'with_front' => false ]
 		];
 
 	}

themes/osi/archive-sc_event.php

@@ -7,14 +7,11 @@
  * @package osi
  */
 
- 
 if ( ! class_exists( 'Sugar_Calendar\\Requirements_Check' ) ) {
-	add_action('init', 
-		function() {
-			wp_safe_redirect( home_url() );
-			exit; 
-		}
-	);
+	add_action('init', function() {
+		wp_safe_redirect( home_url() );
+		exit; 
+	});
 }
 
 $display_type         = isset( $_GET['event-display'] ) ? sanitize_text_field( wp_unslash( $_GET['event-display'] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Recommended