Fix: Use specified time formatting for Outbox Activities (#1537)

* Fix timestamp for Outbox Activities

* Add changelog

* Add const

Author: pfefferle

.github/changelog/1537-from-description

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Use specified date format for `updated` field in Outbox-Activites.

includes/collection/class-outbox.php

@@ -223,7 +223,7 @@ public static function get_activity( $outbox_item ) {
 		}
 
 		if ( 'Update' === $type ) {
-			$activity->set_updated( gmdate( 'Y-m-d H:i:s', strtotime( $outbox_item->post_modified ) ) );
+			$activity->set_updated( gmdate( ACTIVITYPUB_DATE_TIME_RFC3339, strtotime( $outbox_item->post_modified ) ) );
 		}
 
 		/**

includes/constants.php

@@ -64,6 +64,8 @@
 	)
 );
 
+\define( 'ACTIVITYPUB_DATE_TIME_RFC3339', 'Y-m-d\TH:i:s\Z' );
+
 // Define Actor-Modes for the plugin.
 \define( 'ACTIVITYPUB_ACTOR_MODE', 'actor' );
 \define( 'ACTIVITYPUB_BLOG_MODE', 'blog' );

includes/model/class-application.php

@@ -187,7 +187,7 @@ public function get_published() {
 			$time = \time();
 		}
 
-		return \gmdate( 'Y-m-d\TH:i:s\Z', $time );
+		return \gmdate( ACTIVITYPUB_DATE_TIME_RFC3339, $time );
 	}
 
 	/**

includes/model/class-blog.php

@@ -311,7 +311,7 @@ public function get_published() {
 			$time = \time();
 		}
 
-		return \gmdate( 'Y-m-d\TH:i:s\Z', $time );
+		return \gmdate( ACTIVITYPUB_DATE_TIME_RFC3339, $time );
 	}
 
 	/**

includes/model/class-user.php

@@ -226,7 +226,7 @@ public function get_image() {
 	 * @return false|string The date the user was created.
 	 */
 	public function get_published() {
-		return \gmdate( 'Y-m-d\TH:i:s\Z', \strtotime( \get_the_author_meta( 'registered', $this->_id ) ) );
+		return \gmdate( ACTIVITYPUB_DATE_TIME_RFC3339, \strtotime( \get_the_author_meta( 'registered', $this->_id ) ) );
 	}
 
 	/**

includes/scheduler/class-actor.php

@@ -139,7 +139,7 @@ public static function schedule_profile_update( $user_id ) {
 			return;
 		}
 
-		$actor->set_updated( gmdate( 'Y-m-d H:i:s', time() ) );
+		$actor->set_updated( gmdate( ACTIVITYPUB_DATE_TIME_RFC3339, time() ) );
 
 		add_to_outbox( $actor, 'Update', $user_id );
 	}

includes/transformer/class-comment.php

@@ -49,11 +49,11 @@ public function to_object() {
 		$object->set_type( 'Note' );
 
 		$published = \strtotime( $comment->comment_date_gmt );
-		$object->set_published( \gmdate( 'Y-m-d\TH:i:s\Z', $published ) );
+		$object->set_published( \gmdate( ACTIVITYPUB_DATE_TIME_RFC3339, $published ) );
 
 		$updated = \get_comment_meta( $comment->comment_ID, 'activitypub_comment_modified', true );
 		if ( $updated > $published ) {
-			$object->set_updated( \gmdate( 'Y-m-d\TH:i:s\Z', $updated ) );
+			$object->set_updated( \gmdate( ACTIVITYPUB_DATE_TIME_RFC3339, $updated ) );
 		}
 
 		$object->set_content_map(
@@ -302,7 +302,7 @@ public function get_updated() {
 		$published = \get_comment_meta( $this->item->comment_ID, 'activitypub_comment_published', true );
 
 		if ( $updated > $published ) {
-			return \gmdate( 'Y-m-d\TH:i:s\Z', $updated );
+			return \gmdate( ACTIVITYPUB_DATE_TIME_RFC3339, $updated );
 		}
 
 		return null;
@@ -314,7 +314,7 @@ public function get_updated() {
 	 * @return string The published date of the comment.
 	 */
 	public function get_published() {
-		return \gmdate( 'Y-m-d\TH:i:s\Z', \strtotime( $this->item->comment_date_gmt ) );
+		return \gmdate( ACTIVITYPUB_DATE_TIME_RFC3339, \strtotime( $this->item->comment_date_gmt ) );
 	}
 
 	/**

includes/transformer/class-post.php

@@ -573,7 +573,7 @@ protected function get_in_reply_to() {
 	protected function get_published() {
 		$published = \strtotime( $this->item->post_date_gmt );
 
-		return \gmdate( 'Y-m-d\TH:i:s\Z', $published );
+		return \gmdate( ACTIVITYPUB_DATE_TIME_RFC3339, $published );
 	}
 
 	/**
@@ -586,7 +586,7 @@ protected function get_updated() {
 		$updated   = \strtotime( $this->item->post_modified_gmt );
 
 		if ( $updated > $published ) {
-			return \gmdate( 'Y-m-d\TH:i:s\Z', $updated );
+			return \gmdate( ACTIVITYPUB_DATE_TIME_RFC3339, $updated );
 		}
 
 		return null;

tests/includes/collection/class-test-outbox.php

@@ -454,7 +454,7 @@ public function test_update_activity_has_updated_attribute() {
 
 		// Verify the updated attribute is set and matches the post's modified date.
 		$post             = get_post( $id );
-		$expected_updated = gmdate( 'Y-m-d H:i:s', strtotime( $post->post_modified ) );
+		$expected_updated = gmdate( 'Y-m-d\TH:i:s\Z', strtotime( $post->post_modified ) );
 		$this->assertEquals( $expected_updated, $activity->get_updated() );
 
 		// Delete the Outbox item.