diff --git a/templates/admin-header.php b/templates/admin-header.php index 68d5e27..52b255d 100644 --- a/templates/admin-header.php +++ b/templates/admin-header.php @@ -1,15 +1,15 @@
-

ActivityPub

+

-
diff --git a/templates/author-json.php b/templates/author-json.php index c5d39a5..8c5951c 100644 --- a/templates/author-json.php +++ b/templates/author-json.php @@ -75,12 +75,6 @@ if ( \get_the_author_meta( 'user_url', $author_id ) ) { ); } -/* -$json->endpoints = array( - 'sharedInbox' => \get_rest_url( null, '/activitypub/1.0/inbox' ), -); -*/ - // filter output $json = \apply_filters( 'activitypub_json_author_array', $json, $author_id ); diff --git a/templates/blog-json.php b/templates/blog-json.php index 6377ab8..18e65af 100644 --- a/templates/blog-json.php +++ b/templates/blog-json.php @@ -27,10 +27,10 @@ if ( \has_header_image() ) { ); } -$json->inbox = \get_rest_url( null, "/activitypub/1.0/blog/inbox" ); -$json->outbox = \get_rest_url( null, "/activitypub/1.0/blog/outbox" ); -$json->followers = \get_rest_url( null, "/activitypub/1.0/blog/followers" ); -$json->following = \get_rest_url( null, "/activitypub/1.0/blog/following" ); +$json->inbox = \get_rest_url( null, '/activitypub/1.0/blog/inbox' ); +$json->outbox = \get_rest_url( null, '/activitypub/1.0/blog/outbox' ); +$json->followers = \get_rest_url( null, '/activitypub/1.0/blog/followers' ); +$json->following = \get_rest_url( null, '/activitypub/1.0/blog/following' ); $json->manuallyApprovesFollowers = \apply_filters( 'activitypub_json_manually_approves_followers', \__return_false() ); // phpcs:ignore @@ -54,12 +54,6 @@ $json->attachment[] = array( ), ); -/* -$json->endpoints = array( - 'sharedInbox' => \get_rest_url( null, '/activitypub/1.0/inbox' ), -); -*/ - // filter output $json = \apply_filters( 'activitypub_json_blog_array', $json ); diff --git a/templates/followers-list.php b/templates/followers-list.php index 4776851..057f498 100644 --- a/templates/followers-list.php +++ b/templates/followers-list.php @@ -1,7 +1,8 @@

-

+ +

diff --git a/templates/post-json.php b/templates/post-json.php index 8761eca..4c597d6 100644 --- a/templates/post-json.php +++ b/templates/post-json.php @@ -1,4 +1,5 @@ 'active', 'welcome' => '' ) ); ?> + 'active', + 'welcome' => '', + ) +); +?>
-

Site Health to ensure that your site is compatible and/or use the "Help" tab (in the top right of the settings pages).', 'activitypub' ), admin_url( '/wp-admin/site-health.php' ) ); ?>

+

+ ', + \esc_url_raw( \admin_url( '/wp-admin/site-health.php' ) ) + ), + '' + ); + ?> +

-

+

@@ -36,20 +57,22 @@

- +
  • %title% -
  • %content% -
  • %excerpt% -
  • %permalink% -
  • -
  • %shortlink% - ', '' ); ?>
  • + +
  • %shortlink% - ', '' ); ?>
  • %hashtags% -

-

', '' ); ?>

+ +

', '' ); ?>

@@ -77,6 +100,7 @@ true ), 'objects' ); ?>
    +
  • name, $support_post_types, true ) ); ?> /> @@ -102,8 +126,21 @@ - -

    Leave list empty to support all HTML elements. Default: %s.', \esc_html( ACTIVITYPUB_ALLOWED_HTML ) ), 'activitypub' ); ?>

    + +

    + ', + '', + \sprintf( + '%s', + \esc_html( ACTIVITYPUB_ALLOWED_HTML ) + ) + ); + ?> +

    @@ -122,7 +159,19 @@ -

    Disallowed Comment Keys" list.', 'activitypub' ), admin_url( 'options-discussion.php#disallowed_keys' ) ); ?>

    +

    + ', + esc_url_raw( admin_url( 'options-discussion.php#disallowed_keys' ) ) + ), + '' + ); + ?> +

    diff --git a/templates/welcome.php b/templates/welcome.php index 639547f..81f57f8 100644 --- a/templates/welcome.php +++ b/templates/welcome.php @@ -1,4 +1,13 @@ - '', 'welcome' => 'active' ) ); ?> + '', + 'welcome' => 'active', + ) +); +?>

    @@ -7,21 +16,37 @@

    %s or the URL %s. Users who can not access this settings page will find their username on the Edit Profile page.', + // translators: + \esc_html__( + 'People can follow you by using the username %1$s or the URL %2$s. Users who can not access this settings page will find their username on the %3$sEdit Profile%4$s page.', 'activitypub' ), - \esc_attr( \Activitypub\get_webfinger_resource( wp_get_current_user()->ID ) ), - \esc_url_raw( \get_author_posts_url( wp_get_current_user()->ID ) ), - \esc_url_raw( \admin_url( 'profile.php#activitypub' ) ) + \sprintf( + '%s', + \esc_attr( \Activitypub\get_webfinger_resource( wp_get_current_user()->ID ) ) + ), + \sprintf( + '%s', + \esc_url_raw( \get_author_posts_url( wp_get_current_user()->ID ) ) + ), + \sprintf( + '', + \esc_url_raw( \admin_url( 'profile.php#activitypub' ) ) + ), + '' ); ?>

    Site Health to ensure that your site is compatible and/or use the "Help" tab (in the top right of the settings pages).', 'activitypub' ), - \esc_url_raw( admin_url( '/wp-admin/site-health.php' ) ) + // translators: + \esc_html__( 'If you have problems using this plugin, please check the %1$sSite Health%2$s to ensure that your site is compatible and/or use the "Help" tab (in the top right of the settings pages).', 'activitypub' ), + \sprintf( + '', + \esc_url_raw( admin_url( '/wp-admin/site-health.php' ) ) + ), + '' ); ?>