From 356a96adb63ee191ad7b2f66b28bcdf68a7b0389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Menrath?= Date: Wed, 25 Sep 2024 09:43:13 +0200 Subject: [PATCH] Add default function for whether comments are allowed --- includes/activitypub/transformer/class-event.php | 2 +- tests/test-class-plugin-events-manger.php | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/includes/activitypub/transformer/class-event.php b/includes/activitypub/transformer/class-event.php index 994f119..f796e14 100644 --- a/includes/activitypub/transformer/class-event.php +++ b/includes/activitypub/transformer/class-event.php @@ -54,7 +54,7 @@ class Event extends Post { * Get a sane default for whether comments are enabled. */ protected function get_comments_enabled() { - 'open'; + return comments_open( $this->wp_object ); } /** diff --git a/tests/test-class-plugin-events-manger.php b/tests/test-class-plugin-events-manger.php index 7ee8195..9384664 100644 --- a/tests/test-class-plugin-events-manger.php +++ b/tests/test-class-plugin-events-manger.php @@ -94,8 +94,8 @@ class Test_Events_Manager extends WP_UnitTestCase { $this->assertEquals( 'Events Manager Test event', $event_array['name'] ); $this->assertEquals( '', $event_array['content'] ); $this->assertEquals( gmdate( 'Y-m-d', strtotime( '+10 days 15:00:00' ) ) . 'T15:00:00Z', $event_array['startTime'] ); - // $this->assertTrue( $event_array['commentsEnabled'] ); - // $this->assertEquals( 'allow_all', $event_array['repliesModerationOption'] ); + $this->assertEquals( comments_open( $event->post_id ), $event_array['commentsEnabled'] ); + $this->assertEquals( comments_open( $event->post_id )? 'allow_all' : 'closed', $event_array['repliesModerationOption'] ); $this->assertEquals( 'external', $event_array['joinMode'] ); $this->assertArrayNotHasKey( 'location', $event_array ); $this->assertEquals( 'MEETING', $event_array['category'] ); @@ -142,8 +142,6 @@ class Test_Events_Manager extends WP_UnitTestCase { $this->assertEquals( 'Events Manager Test event', $event_array['name'] ); $this->assertEquals( '', $event_array['content'] ); $this->assertEquals( gmdate( 'Y-m-d', strtotime( '+10 days 15:00:00' ) ) . 'T15:00:00Z', $event_array['startTime'] ); - // $this->assertTrue( $event_array['commentsEnabled'] ); - // $this->assertEquals( 'allow_all', $event_array['repliesModerationOption'] ); $this->assertEquals( 'external', $event_array['joinMode'] ); $this->assertEquals( 'MEETING', $event_array['category'] ); $this->assertArrayHasKey( 'location', $event_array );