Changeset 3101476

Timestamp:

06/12/2024 03:25:32 AM (8 weeks ago)

Author:

akirk

Message:

enable-mastodon-apps 0.9.1

Location:

enable-mastodon-apps/trunk

Files:

• README.md (modified) (3 diffs)
• enable-mastodon-apps.php (modified) (3 diffs)
• includes/class-comment-cpt.php (modified) (3 diffs)
• includes/class-mastodon-admin.php (modified) (1 diff)
• includes/class-mastodon-api.php (modified) (1 diff)
• includes/class-mastodon-oauth.php (modified) (1 diff)
• includes/entity/class-media-attachment.php (modified) (1 diff)
• includes/handler/class-instance.php (modified) (1 diff)
• includes/handler/class-media-attachment.php (modified) (2 diffs)
• templates/welcome.php (modified) (6 diffs)

enable-mastodon-apps/trunk/README.md

@@ -7 +7 @@
 - Requires PHP: 7.4
 - License: [GPLv2 or later](http://www.gnu.org/licenses/gpl-2.0.html)
-- Stable tag: 0.9.0
+- Stable tag: 0.9.
 
 Allow accessing your WordPress with Mastodon clients. Just enter your own blog URL as your instance.
@@ -98 +98 @@
 ## Changelog
 
+
+
+
+
+
+
+
+
 ### 0.9.0
 - Complete Rewrite, started at the Cloudfest Hackathon! Props @pfefferle, @drivingralle, @kittmedia, @obenland
@@ -117 +125 @@
 
 
+
+
+
+
+
+
 [#140]: https://github.com/akirk/enable-mastodon-apps/pull/140
 [#138]: https://github.com/akirk/enable-mastodon-apps/pull/138

enable-mastodon-apps/trunk/enable-mastodon-apps.php

@@ -4 +4 @@
  * Plugin author: Alex Kirk
  * Plugin URI: https://github.com/akirk/enable-mastodon-apps
- * Version: 0.9.0
+ * Version: 0.9.
  *
  * Description: Allow accessing your WordPress with Mastodon clients. Just enter your own blog URL as your instance.
@@ -16 +16 @@
 defined( 'ABSPATH' ) || exit;
 define( 'ENABLE_MASTODON_APPS_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
-define( 'ENABLE_MASTODON_APPS_VERSION', '0.9.0' );
+define( 'ENABLE_MASTODON_APPS_VERSION', '0.9.' );
 
 require __DIR__ . '/vendor/bshaffer/oauth2-server-php/src/OAuth2/Autoloader.php';
@@ -65 +65 @@
     }
 );
+
+
+
+

enable-mastodon-apps/trunk/includes/class-comment-cpt.php

@@ -4 +4 @@
  *
  * This contains the automatic mapping of comments to a custom post type.
+
+
+
+
+
+
+
+
  *
  * @package Enable_Mastodon_Apps
@@ -79 +87 @@
             $comment = get_comment( $comment_id );
         }
-        if ( ! $comment ) {
+        if ( ! $comment ) {
             return;
         }
@@ -147 +155 @@
         $post_id = self::comment_id_to_post_id( $comment->comment_ID );
         if ( ! $post_id ) {
-            return;
-        }
-
-        $post_data = array(
-            'ID'          => $post_id,
-            'post_status' => 'publish' === $new_status ? 'publish' : 'private',
-        );
-
-        wp_update_post( $post_data );
-    }
-
-    public function update_comment_post( $comment_id, $comment ) {
+            if (
+                'approved' === $new_status &&
+                'approved' !== $old_status
+            ) {
+                self::create_comment_post( $comment->comment_ID, $comment );
+            }
+            return;
+        }
+
+        if ( 'approved' === $new_status ) {
+            wp_update_post(
+                array(
+                    'ID'            => $post_id,
+                    'post_content'  => $comment->comment_content,
+                    'post_date'     => $comment->comment_date,
+                    'post_date_gmt' => $comment->comment_date_gmt,
+                    'post_status'   => 'publish',
+                )
+            );
+            return;
+        }
+
+        if (
+            'trash' === $new_status ||
+            'spam' === $new_status
+        ) {
+            $this->delete_comment_post( $comment->comment_ID );
+            return;
+        }
+    }
+
+    public function update_comment_post( $comment_id, $data ) {
         $post_id = self::comment_id_to_post_id( $comment_id );
         if ( ! $post_id ) {
             return;
         }
-
         $post_data = array(
             'ID'            => $post_id,
-            'post_content'  => $comment->comment_content,
-            'post_date'     => $comment->comment_date,
-            'post_date_gmt' => $comment->comment_date_gmt,
+            'post_content'  => $data['comment_content'],
+            'post_date'     => $data['comment_date'],
+            'post_date_gmt' => $data['comment_date_gmt'],
+            'post_status'   => $data['comment_approved'] ? 'publish' : 'trash',
         );
 

enable-mastodon-apps/trunk/includes/class-mastodon-admin.php

@@ -447 +447 @@
         );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

enable-mastodon-apps/trunk/includes/class-mastodon-api.php

@@ -1177 +1177 @@
                         'type'        => 'string',
                         'description' => 'The type of search to perform.',
-                        'enum'        => array( 'accounts', 'hashtags', 'statuses' ),
-                        'default'     => 'statuses',
+                        'enum'        => array( 'accounts', 'hashtags', 'statuses' ),
+                        'default'     => '',
                     ),
                     'resolve'    => array(

enable-mastodon-apps/trunk/includes/class-mastodon-oauth.php

@@ -170 +170 @@
     public function get_token() {
         $request = Request::createFromGlobals();
-        if ( ! $this->server->verifyResourceRequest( $request ) ) {
+        $response = new Response();
+        if ( ! $this->server->verifyResourceRequest( $request, $response ) ) {
             return null;
         }
-        return $this->server->getAccessTokenData( $request );
+        return $this->server->getAccessTokenData( $request );
     }
 

enable-mastodon-apps/trunk/includes/entity/class-media-attachment.php

@@ -141 +141 @@
         return parent::validate( $key );
     }
+
+
+
+
+
+
+
 }

enable-mastodon-apps/trunk/includes/handler/class-instance.php

@@ -38 +38 @@
         add_filter( 'mastodon_api_instance_extended_description', array( $this, 'api_instance_extended_description' ) );
         add_action( 'update_option_blogdescription', array( $this, 'save_created_at' ) );
-
-        // Enable the link manager so peers can be added/updated.
-        add_filter( 'pre_option_link_manager_enabled', '__return_true' );
     }
 

enable-mastodon-apps/trunk/includes/handler/class-media-attachment.php

@@ -181 +181 @@
                     'height' => intval( $block['height'] ),
                     'size'   => $block['width'] . 'x' . $block['height'],
-                    'aspect' => $block['width'] / $block['height'],
+                    'aspect' =>  $block['height'],
                 );
             } else {
@@ -246 +246 @@
                     'height' => intval( $block['height'] ),
                     'size'   => $block['width'] . 'x' . $block['height'],
-                    'aspect' => $block['width'] / $block['height'],
+                    'aspect' =>  $block['height'],
                 );
             } else {

enable-mastodon-apps/trunk/templates/welcome.php

@@ -14 +14 @@
         <h2><?php esc_html_e( 'Welcome', 'enable-mastodon-apps' ); ?></h2>
         <p>
-            <?php esc_html_e( 'This plugin enables you to access your WordPress with Mastodon clients.', 'enable-mastodon-apps' ); ?>
+            <span><?php esc_html_e( 'This plugin enables you to access your WordPress with Mastodon clients.', 'enable-mastodon-apps' ); ?></span>
+            <span>
             <?php
                 echo wp_kses(
@@ -30 +31 @@
                 );
                 ?>
-            <?php esc_html_e( 'Make sure you scroll down to the "Browse third-party apps" section for more choice.', 'enable-mastodon-apps' ); ?>
+            </span>
+            <span><?php esc_html_e( 'Make sure you scroll down to the "Browse third-party apps" section for more choice.', 'enable-mastodon-apps' ); ?></span>
         </p>
         <p>
@@ -37 +39 @@
         <input type="text" class="regular-text copyable" id="enable-mastodon-apps-instance" value="<?php echo esc_attr( $args['instance_url'] ); ?>" readonly="readonly">
         <p>
-            <?php esc_html_e( 'The Mastodon app will then redirect you to the login page of your own WordPress site.', 'enable-mastodon-apps' ); ?>
-            <?php esc_html_e( 'Double-check the URL of the login form so that you don\'t enter your details on another site.', 'enable-mastodon-apps' ); ?>
-            <?php esc_html_e( 'You\'ll need to log in there and then authorize the app.', 'enable-mastodon-apps' ); ?>
+            <>
+            <>
+            <>
         </p>
         <p>
@@ -66 +68 @@
         <h2><?php esc_html_e( 'Recommended Plugins', 'enable-mastodon-apps' ); ?></h2>
         <p>
-            <?php esc_html_e( 'The Enable Mastodon Apps plugin works well on its own: it allows you to publish posts and show your all blog posts in the apps\' timelines.', 'enable-mastodon-apps' ); ?>
-            <?php esc_html_e( 'This can already be very useful on a blog where multiple people interact.', 'enable-mastodon-apps' ); ?>
+            <>
+            <>
         </p>
 
         <p>
-            <?php esc_html_e( 'That said, it was designed so that it can be meaningfully extended by other plugins.', 'enable-mastodon-apps' ); ?>
-            <?php esc_html_e( 'In particular this is the case for the following plugins:', 'enable-mastodon-apps' ); ?>
+            <>
+            <>
         </p>
     </div>
@@ -89 +91 @@
         <div id="enable-mastodon-apps-settings-accordion-block-activitypub-plugin" class="enable-mastodon-apps-settings-accordion-panel plugin-card-activitypub" hidden="hidden">
             <p>
-                <?php \esc_html_e( 'The Activitypub plugin allows you interact with the Fediverse, for example Mastodon.', 'enable-mastodon-apps' ); ?>
-                <?php \esc_html_e( 'With this plugin installed, for example, you can search for Mastodon users and view their posts.', 'enable-mastodon-apps' ); ?>
+                <>
+                <>
             </p>
             <?php if ( defined( 'ACTIVITYPUB_PLUGIN_VERSION' ) ) : ?>
                 <p><strong><?php \esc_html_e( 'The Activitypub plugin is installed.', 'enable-mastodon-apps' ); ?></strong></p>
             <?php else : ?>
-                <p><a href="<?php echo \esc_url_raw( \admin_url( 'plugin-install.php?tab=plugin-information&plugin=activitypub&TB_iframe=true' ) ); ?>" class="thickbox open-plugin-details-modal button install-now" target="_blank"><?php \esc_html_e( 'Install the Friends Plugin', 'enable-mastodon-apps' ); ?></a></p>
+                <p><a href="<?php echo \esc_url_raw( \admin_url( 'plugin-install.php?tab=plugin-information&plugin=activitypub&TB_iframe=true' ) ); ?>" class="thickbox open-plugin-details-modal button install-now" target="_blank"><?php \esc_html_e( 'Install the  Plugin', 'enable-mastodon-apps' ); ?></a></p>
             <?php endif; ?>
         </div>
@@ -112 +114 @@
         <div id="enable-mastodon-apps-settings-accordion-block-friends-plugin" class="enable-mastodon-apps-settings-accordion-panel plugin-card-friends" hidden="hidden">
             <p>
-                <?php \esc_html_e( 'The Friends plugin allows you to follow others from within your own WordPress.', 'enable-mastodon-apps' ); ?>
-                <?php \esc_html_e( 'This will give you a feed of your friends\' posts which will also be displayed in the Enable Mastodon Apps plugin.', 'enable-mastodon-apps' ); ?>
-                <?php \esc_html_e( 'Combined with ActivityPub plugin you can also follow and interact with people over the ActivityPub protocol, for example on Mastodon.', 'enable-mastodon-apps' ); ?>
+                <>
+                <>
+                <>
             </p>
             <?php if ( defined( 'FRIENDS_VERSION' ) ) : ?>