Changeset 2024

Timestamp:

11/01/2015 08:39:57 PM (11 years ago)

Author:

nacin

Message:

Trac Notifications: Only one API roundtrip for the notifications box.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications

Files:

• trac-notifications-db.php (modified) (1 diff)
• trac-notifications.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-notifications-db.php

@@ -94 +94 @@
         }
 
+        function get_trac_notifications_info( $ticket_id, $username ) {
+                $meta = array(
+                        'get_trac_ticket'                              => $this->get_trac_ticket( $ticket_id ),
+                        'get_trac_ticket_focuses'                      => $this->get_trac_ticket_focuses( $ticket_id ),
+                        'get_trac_notifications_for_user'              => $this->get_trac_notifications_for_user( $username ),
+                        'get_trac_ticket_subscription_status_for_user' => $this->get_trac_ticket_subscription_status_for_user( $ticket_id, $username ),
+                        'get_trac_ticket_subscriptions'                => $this->get_trac_ticket_subscriptions( $ticket_id ),
+                        'get_trac_ticket_participants'                 => $this->get_trac_ticket_participants( $ticket_id ),
+                );
+
+                if ( $meta['get_trac_ticket']->reporter !== $username ) {
+                        $meta['get_reporter_last_activity'] = $this->get_reporter_past_activity( $meta['get_trac_ticket']->reporter, $ticket_id );
+                }
+
+                return $meta;
+        }
+
         function get_trac_ticket( $ticket_id ) {
                 return $this->db->get_row( $this->db->prepare( "SELECT * FROM ticket WHERE id = %d", $ticket_id ) );

sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-notifications.php

@@ -197 +197 @@
                         exit;
                 }
-                $ticket = $this->api->get_trac_ticket( $ticket_id );
-                if ( ! $ticket ) {
-                        exit;
-                }
-
-                $focuses = explode( ', ', $this->api->get_trac_ticket_focuses( $ticket_id ) );
-
-                $notifications = $this->api->get_trac_notifications_for_user( $username );
-
-                $ticket_sub = $this->api->get_trac_ticket_subscription_status_for_user( $ticket_id, $username );
-
-                $ticket_subscriptions = $this->api->get_trac_ticket_subscriptions( $ticket_id );
+
+                $meta = $this->api->get_trac_notifications_info( $ticket_id, $username );
+                if ( ! $meta ) {
+                        exit;
+                }
+
+                $ticket               = $meta['get_trac_ticket'];
+                $focuses              = $meta['get_trac_ticket_focuses'];
+                $notifications        = $meta['get_trac_ticket_focuses'];
+                $ticket_sub           = $meta['get_trac_ticket_subscription_status_for_user'];
+                $ticket_subscriptions = $meta['get_trac_ticket_subscriptions'];
+                $participants         = $meta['get_trac_ticket_participants'];
+
+                $focuses = explode( ', ', $focuses );
                 $stars = $ticket_subscriptions['starred'];
                 $star_count = count( $stars );
-
-                $participants = $this->api->get_trac_ticket_participants( $ticket_id );
 
                 $unblocked_participants = array_diff( $participants, $ticket_subscriptions['blocked'] );
@@ -312 +312 @@
         </div>
         <?php
-                $this->ticket_notes( $ticket, $username );
+                $this->ticket_notes( $ticket, $username, $meta );
                 $send = array( 'notifications-box' => ob_get_clean() );
                 if ( isset( $this->components ) ) {
@@ -321 +321 @@
         }
 
-        function ticket_notes( $ticket, $username ) {
+        function ticket_notes( $ticket, $username, $meta ) {
                 if ( $username == $ticket->reporter ) {
                         return;
                 }
 
-                $activity = $this->api->get_reporter_past_activity( $ticket->reporter, $ticket->id );
+                $activity = $meta['get_reporter_last_activity'];
 
                 if ( count( $activity['tickets'] ) >= 5 ) {