Changeset 3245135

Timestamp:

02/23/2025 06:36:14 AM (2 weeks ago)

Author:

akirk

Message:

enable-mastodon-apps 1.2.1

Location:

enable-mastodon-apps/trunk

Files:

• README.md (modified) (2 diffs)
• enable-mastodon-apps.php (modified) (2 diffs)
• includes/class-comment-cpt.php (modified) (1 diff)
• includes/handler/class-account.php (modified) (2 diffs)
• includes/handler/class-notification.php (modified) (3 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: 1.2.0
+- Stable tag: 1.2.1
 
 Allow accessing your WordPress with Mastodon clients. Just enter your own blog URL as your instance.
@@ -101 +101 @@
 ## Changelog
 
-### 1.2.0
+### 1.2.1
 - Fixed Boost, Like and Comment notifications ([#216])
 - Announce Initial and Changed App Settings ([#207], [#214])

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

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

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

@@ -237 +237 @@
         }
 
-        return apply_filters( 'mastodon_api_account', null, $comment->comment_author_url, $request, null );
+        $account = apply_filters( 'mastodon_api_account', null, $comment->comment_author_url, $request, null );
+        if ( $account ) {
+            return $account;
+        }
+
+        $account = new Entity\Account();
+        $account->id             = $comment->comment_author_url;
+        $account->username       = $comment->comment_author;
+        $account->display_name   = $comment->comment_author;
+        $account->avatar         = get_avatar_url( $comment->comment_author_email );
+        $account->avatar_static  = get_avatar_url( $comment->comment_author_email );
+        $account->acct           = $comment->comment_author_url;
+        $account->note           = '';
+        $account->created_at     = new \DateTime( $comment->comment_date );
+        $account->statuses_count = 0;
+        $account->last_status_at = new \DateTime( $comment->comment_date );
+        $account->url            = $comment->comment_author_url;
+
+        $account->source = array(
+            'privacy'   => 'public',
+            'sensitive' => false,
+            'language'  => 'en',
+            'note'      => 'Comment',
+            'fields'    => array(),
+        );
+
+        return Handler\Account::api_account_ensure_numeric_id( $account, $comment->comment_author_url );
     }
 }

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

@@ -28 +28 @@
         add_filter( 'mastodon_api_account', array( $this, 'api_account' ), 10, 2 );
         add_filter( 'mastodon_api_account', array( $this, 'api_account_ema' ), 10, 4 );
-        add_filter( 'mastodon_api_account', array( $this, 'api_account_ensure_numeric_id' ), 100, 2 );
+        add_filter( 'mastodon_api_account', array( get_called_class(), 'api_account_ensure_numeric_id' ), 100, 2 );
     }
 
@@ -96 +96 @@
     }
 
-    public function api_account_ensure_numeric_id( $user_data, $user_id ) {
+    public static function api_account_ensure_numeric_id( $user_data, $user_id ) {
         if ( ! is_object( $user_data ) ) {
             return $user_data;

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

@@ -160 +160 @@
             foreach ( get_posts( $args ) as $post ) {
                 $comment_id = Comment_CPT::post_id_to_comment_id( $post->ID );
-                $account = apply_filters( 'mastodon_api_account', null, $post->post_author, null, $post );
                 switch ( get_comment_type( $comment_id ) ) {
                     case 'like':
-                        $type = 'like';
+                        $type = 'favourite';
                         $status  = apply_filters( 'mastodon_api_status', null, $post->post_parent, array() );
                         break;
@@ -174 +173 @@
                         $status  = apply_filters( 'mastodon_api_status', null, $post->ID, array() );
                 }
-                if ( $account && $status ) {
-                    $notifications[] = $this->get_notification_array(
-                        $type,
-                        mysql2date( 'Y-m-d\TH:i:s.000P', $post->post_date, false ),
-                        $account,
-                        $status
-                    );
+                $account = apply_filters( 'mastodon_api_account', null, $post->post_author, null, $post );
+                if ( $status ) {
+                    $status->account = $account;
                 }
-            }
-        }
-
+
+                $notifications[] = $this->get_notification_array(
+                    $type,
+                    mysql2date( 'Y-m-d\TH:i:s.000P', $post->post_date, false ),
+                    $account,
+                    $status
+                );
+            }
+        }
         $min_id      = $request->get_param( 'min_id' );
         $max_id      = $request->get_param( 'max_id' );
@@ -245 +246 @@
      * @return array
      */
-    protected function get_notification_array( string $type, $date, \Enable_Mastodon_Apps\Entity\Account $account, \Enable_Mastodon_Apps\Entity\Status $status ): array {
+    protected function get_notification_array( string $type, $date, ?\Enable_Mastodon_Apps\Entity\Account $account = null, ?\Enable_Mastodon_Apps\Entity\Status $status = null ): array {
         $notification = array(
             'id'         => preg_replace( '/[^0-9]/', '', $date ),