- Filter only for users who have written a comment #1220

publishpress · Sep 25, 2023 · b83dc98 · b83dc98
1 parent 3ede072
commit b83dc98
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 12 deletions.
diff --git a/modules/editorial-comments/editorial-comments.php b/modules/editorial-comments/editorial-comments.php
@@ -357,6 +357,8 @@ public function ajaxSearchPost()
 
         public function ajaxSearchUser()
         {
+            global $wpdb;
+
             $ajax = Ajax::getInstance();
 
             if (! isset($_GET['nonce']) || ! wp_verify_nonce(
@@ -370,7 +372,7 @@ public function ajaxSearchUser()
                 $ajax->sendJsonError(Error::ERROR_CODE_ACCESS_DENIED);
             }
 
-            $queryText = isset($_GET['q']) ? sanitize_text_field($_GET['q']) : '';
+            $queryText = isset($_GET['search']) ? sanitize_text_field($_GET['search']) : '';
 
             $output = [
                 'results' => [],
@@ -390,16 +392,33 @@ public function ajaxSearchUser()
                 $ajax->sendJson($output);
             }
 
-            $user_args = [
-                'number' => 20,
-                'orderby' => 'display_name',
-                'capability' => 'edit_posts',
-            ];
-            if (! empty($queryText)) {
-                $user_args['search'] = '*' . $queryText . '*';
+            // Define the custom SQL query to get users who have written comments
+            $commentType = self::comment_type;
+
+            $userSql = "SELECT DISTINCT u.ID, u.display_name
+            FROM {$wpdb->users} AS u
+            INNER JOIN {$wpdb->comments} AS c 
+            ON u.ID = c.user_id
+            WHERE c.comment_type = %s";
+
+            if (!empty($queryText)) {
+                $userSql .= $wpdb->prepare(
+                    " AND (user_login LIKE %s
+                    OR user_url LIKE %s
+                    OR user_email LIKE %s
+                    OR user_nicename LIKE %s
+                    OR display_name LIKE %s)",
+                    '%' . $wpdb->esc_like($queryText) . '%',
+                    '%' . $wpdb->esc_like($queryText) . '%',
+                    '%' . $wpdb->esc_like($queryText) . '%',
+                    '%' . $wpdb->esc_like($queryText) . '%',
+                    '%' . $wpdb->esc_like($queryText) . '%'
+                );
             }
 
-            $users = get_users($user_args);
+            $userSql .= " ORDER BY u.display_name LIMIT 20";
+
+            $users = $wpdb->get_results($wpdb->prepare($userSql, $commentType));
 
             foreach ($users as $user) {
                 $results[] = [

diff --git a/modules/improved-notifications/assets/js/improved-notifications.js b/modules/improved-notifications/assets/js/improved-notifications.js
@@ -1,6 +1,6 @@
 jQuery(function ($) {
     if (ppNotif.log_url !== '' && $('body').hasClass('post-type-psppnotif_workflow') && $('.wrap .page-title-action').length > 0) {
-        var customButton = ' &nbsp; <a href="' + ppNotif.log_url + '" class="page-title-action">' + ppNotif.log_text + '</a>';
+        var customButton = ' &nbsp; <a href="' + ppNotif.log_url + '" class="page-title-action">' + ppNotif.log_text + ' (' + ppNotif.log_total + ')</a>';
         $('.wrap .page-title-action').after(customButton);
     }
 });
diff --git a/modules/improved-notifications/improved-notifications.php b/modules/improved-notifications/improved-notifications.php
@@ -40,6 +40,7 @@
 use PublishPress\Notifications\Workflow\Step\Event_Content\Filter\Post_Type as Post_Type_Filter;
 use PublishPress\Notifications\Workflow\Step\Event_Content\Post_Type;
 use PublishPress\Notifications\Workflow\Step\Receiver\Site_Admin as Receiver_Site_Admin;
+use PublishPress\NotificationsLog\NotificationsLogHandler;
 
 if (! class_exists('PP_Improved_Notifications')) {
     /**
@@ -720,13 +721,24 @@ public function add_admin_scripts($hook_suffix)
                         PUBLISHPRESS_VERSION,
                         true
                     );
+
+                    if ($this->module_enabled('notifications_log')) {
+                        $logHandler = new NotificationsLogHandler();
+                        $log_url    = admin_url('admin.php?page=pp-notif-log');
+                        $log_total  = number_format_i18n($logHandler->getNotificationLogEntries(null, null, null, true));
+                    } else {
+                        $log_url    = '';
+                        $log_total  = '';
+
+                    }
 
                     wp_localize_script(
                         'improved-notifications-js',
                         'ppNotif',
                         [
-                            'log_url'  => ($this->module_enabled('notifications_log')) ? admin_url('admin.php?page=pp-notif-log') : '',
-                            'log_text' => esc_html__('Notifications Log', 'publishpress'),
+                            'log_total' => $log_total,
+                            'log_url'   => $log_url,
+                            'log_text'  => esc_html__('Notifications Log', 'publishpress'),
                         ]
                     );
                 }