Event-Federation/wordpress-activitypub
Event-Federation/wordpress-activitypub
7
1
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity Actions

fix phpcs errors

Browse source
This commit is contained in:
André Menrath 2023-11-22 14:24:25 +01:00
parent 0bd6eccfed
commit 804cb0af1a
7 changed files with 39 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/activity/class-event.php
View file

@ -19,5 +19,5 @@ use Activitypub\Activity\Base_Object;
* @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-event * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-event
*/ */
class Note extends Base_Object { class Note extends Base_Object {
protected $type = 'Event'; protected $type = 'Event';
} }

2
includes/activity/class-note.php
View file

@ -19,5 +19,5 @@ use Activitypub\Activity\Base_Object;
* @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-note * @see https://www.w3.org/TR/activitystreams-vocabulary/#dfn-note
*/ */
class Note extends Base_Object { class Note extends Base_Object {
protected $type = 'Note'; protected $type = 'Note';
} }

17
includes/class-admin.php
View file

@ -25,9 +25,13 @@ class Admin {
} }
add_filter( add_filter(
'activitypub/transformers/is_transformer_enabled', function( $should_register, Transformer_Base $widget_instance ) { 'activitypub/transformers/is_transformer_enabled',
return ! Options::is_transformer_disabled( $transformer_instance->get_name() ); function( $should_register, Transformer_Base $transformer_instance ) {
}, 10, 2 ); return ! Options::is_transformer_disabled( $transformer_instance->get_name() );
},
10,
2
);
} }
/** /**
@ -187,7 +191,7 @@ class Admin {
), ),
'sanitize_callback' => function ( $value ) { 'sanitize_callback' => function ( $value ) {
// Check if $value is an array // Check if $value is an array
if (!is_array($value)) { if ( ! is_array( $value ) ) {
return array(); return array();
} }
$value_keys = array_keys( $value ); $value_keys = array_keys( $value );
@ -196,12 +200,11 @@ class Admin {
// Unset the keys that are missing in $keysToCheck // Unset the keys that are missing in $keysToCheck
foreach ( array_diff( $value_keys, $all_public_post_types ) as $missing_key ) { foreach ( array_diff( $value_keys, $all_public_post_types ) as $missing_key ) {
unset($value[$missing_key]); unset( $value[ $missing_key ] );
} }
// var_dump($value); // var_dump($value);
return $value; return $value;
},
}
) )
); );
\register_setting( \register_setting(

4
includes/model/class-post.php
View file

@ -1,7 +1,7 @@
<?php <?php
namespace Activitypub\Model; namespace Activitypub\Model;
use Activitypub\Transformer\Post; use Activitypub\Transformer\Post as Transformer_Post;
/** /**
* ActivityPub Post Class * ActivityPub Post Class
@ -34,7 +34,7 @@ class Post {
_deprecated_function( __CLASS__, '1.0.0', '\Activitypub\Transformer\Post' ); _deprecated_function( __CLASS__, '1.0.0', '\Activitypub\Transformer\Post' );
$this->post = $post; $this->post = $post;
$this->object = Post_Transformer->set_wp_post( $post )->to_object(); $this->object = Transformer_Post->set_wp_post( $post )->to_object();
} }
/** /**

2
includes/rest/class-outbox.php
View file

@ -59,7 +59,7 @@ class Outbox {
return $user; return $user;
} }
$post_types = array_keys( \get_option( 'activitypub_transformer_mapping', array( 'post' => 'activitypub/default', 'page' => 'activitypub/default') ) ); $post_types = array_keys( \get_option( 'activitypub_transformer_mapping', array( 'post' => 'activitypub/default', 'page' => 'activitypub/default' ) ) );
$page = $request->get_param( 'page', 1 ); $page = $request->get_param( 'page', 1 );

21
includes/transformer/class-base.php
View file

@ -37,15 +37,20 @@ abstract class Base {
* @return void * @return void
*/ */
public function set_wp_post( WP_Post $wp_post ) { public function set_wp_post( WP_Post $wp_post ) {
if ( $this->supports_post_type( get_post_type( $wp_post ) ) ) { $post_type = get_post_type( $wp_post );
$this->wp_post = $wp_post; if ( ! $this->supports_post_type( $post_type ) ) {
} else { _doing_it_wrong(
// TODO Error, this should not happen. __METHOD__,
/* translators: %s: Block name. */
sprintf( 'The Transformer "%s" does not support the post type "%s".', esc_html( $this->get_label() ), esc_html( $post_type ) ),
'version_number_transformer_management_placeholder'
);
} }
$this->wp_post = $wp_post;
} }
/** /**
* Get the supported WP post_types that the transformer can use as an input. * Get the supported WP post types that the transformer can use as an input.
* *
* By default all post types are supported. * By default all post types are supported.
* You may very likely wish to override this function. * You may very likely wish to override this function.
@ -74,7 +79,11 @@ abstract class Base {
$plugins_data = get_plugins( '/' . $plugin_directory ); $plugins_data = get_plugins( '/' . $plugin_directory );
$plugin_data = array_shift( $plugins_data ); $plugin_data = array_shift( $plugins_data );
return $plugin_data['Name'] ?? esc_html__( 'Unknown', 'activitypub' ); if ( isset( $plugin_data['Name'] ) ) {
return $plugin_data['Name'];
} else {
return esc_html__( 'Unknown', 'activitypub' );
}
} }
/** /**

19
includes/transformer/class-transformers-manager.php
View file

@ -91,7 +91,7 @@ class Transformers_Manager {
return get_called_class(); return get_called_class();
} }
/** /**
* Transformers manager constructor. * Transformers manager constructor.
* *
* Initializing ActivityPub transformers manager. * Initializing ActivityPub transformers manager.
@ -137,12 +137,12 @@ class Transformers_Manager {
* *
* @return bool True if the ActivityPub transformer was registered. * @return bool True if the ActivityPub transformer was registered.
*/ */
public function register( \ActivityPub\Transformer\Base $transformer_instance) { public function register( \ActivityPub\Transformer\Base $transformer_instance ) {
if ( ! $transformer_instance instanceof \ActivityPub\Transformer\Base ) { if ( ! $transformer_instance instanceof \ActivityPub\Transformer\Base ) {
_doing_it_wrong( _doing_it_wrong(
__METHOD__, __METHOD__,
__( 'ActivityPub transformer instance must be a of \ActivityPub\Transformer_Base class.' ), \esc_html__( 'ActivityPub transformer instance must be a of \ActivityPub\Transformer_Base class.' ),
'version_number_transformer_management_placeholder' 'version_number_transformer_management_placeholder'
); );
return false; return false;
@ -152,7 +152,7 @@ class Transformers_Manager {
if ( preg_match( '/[A-Z]+/', $transformer_name ) ) { if ( preg_match( '/[A-Z]+/', $transformer_name ) ) {
_doing_it_wrong( _doing_it_wrong(
__METHOD__, __METHOD__,
__( 'ActivityPub transformer names must not contain uppercase characters.' ), \esc_html__( 'ActivityPub transformer names must not contain uppercase characters.' ),
'version_number_transformer_management_placeholder' 'version_number_transformer_management_placeholder'
); );
return false; return false;
@ -162,7 +162,7 @@ class Transformers_Manager {
if ( ! preg_match( $name_matcher, $transformer_name ) ) { if ( ! preg_match( $name_matcher, $transformer_name ) ) {
_doing_it_wrong( _doing_it_wrong(
__METHOD__, __METHOD__,
__( 'ActivityPub transformer names must contain a namespace prefix. Example: my-plugin/my-custom-transformer' ), \esc_html__( 'ActivityPub transformer names must contain a namespace prefix. Example: my-plugin/my-custom-transformer' ),
'version_number_transformer_management_placeholder' 'version_number_transformer_management_placeholder'
); );
return false; return false;
@ -172,7 +172,7 @@ class Transformers_Manager {
_doing_it_wrong( _doing_it_wrong(
__METHOD__, __METHOD__,
/* translators: %s: Block name. */ /* translators: %s: Block name. */
sprintf( __( 'ActivityPub transformer with name "%s" is already registered.' ), $transformer_name ), sprintf( 'ActivityPub transformer with name "%s" is already registered.', esc_html( $transformer_name ) ),
'version_number_transformer_management_placeholder' 'version_number_transformer_management_placeholder'
); );
return false; return false;
@ -190,7 +190,7 @@ class Transformers_Manager {
// $should_register = apply_filters( 'activitypub/transformers/is_transformer_enabled', true, $transformer_instance ); // $should_register = apply_filters( 'activitypub/transformers/is_transformer_enabled', true, $transformer_instance );
// if ( ! $should_register ) { // if ( ! $should_register ) {
// return false; // return false;
// } // }
$this->transformers[ $transformer_name ] = $transformer_instance; $this->transformers[ $transformer_name ] = $transformer_instance;
@ -209,7 +209,7 @@ class Transformers_Manager {
*/ */
private function init_transformers() { private function init_transformers() {
$builtin_transformers = [ $builtin_transformers = [
'post' 'post',
]; ];
$this->transformers = []; $this->transformers = [];
@ -270,7 +270,7 @@ class Transformers_Manager {
* @since version_number_transformer_management_placeholder * @since version_number_transformer_management_placeholder
* @access public * @access public
* *
* @param WP_Post|WP_Comment $wp_post The WordPress Post/Comment. * @param WP_Post|WP_Comment $wp_post The WordPress Post/Comment.
* *
* @return \ActivityPub\Transformer\Base|null Registered transformers. * @return \ActivityPub\Transformer\Base|null Registered transformers.
*/ */
@ -290,4 +290,3 @@ class Transformers_Manager {
} }
} }
} }