Changeset 12274

Timestamp:

11/23/2022 06:22:00 PM (3 years ago)

Author:

amieiro

Message:

Translate: Add mentions to comment box and Disable only Feedback <summary> events

​https://github.com/GlotPress/gp-translation-helpers/pull/113
​https://github.com/GlotPress/gp-translation-helpers/pull/143

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers

Files:

• helpers-assets/templates/translation-discussion-comments.php (modified) (1 diff)
• helpers/helper-translation-discussion.php (modified) (3 diffs)
• includes/class-wporg-customizations.php (modified) (1 diff)
• includes/class-wporg-notifications.php (modified) (2 diffs)
• js/reject-feedback.js (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/helpers-assets/templates/translation-discussion-comments.php

@@ -185 +185 @@
     ?>
 </div><!-- .discussion-wrapper -->
+<script>    
+    jQuery(function( e, mentions ) {
+        var mentionsList = '<?php echo wp_json_encode( $mentions_list ); ?>';
+        var jetpackMentionsData = JSON.parse( mentionsList );
+        if( jetpackMentionsData.length > 0 ) {
+            jQuery( 'textarea#comment' ).mentions( jetpackMentionsData );
+        }
+    });
+</script>

sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/helpers/helper-translation-discussion.php

@@ -267 +267 @@
         }
 
+        // phpcs:ignore WordPress.Security.NonceVerification.Missing
+        $locale_exists = isset( $_POST['meta']['locale'] ) && ! empty( $this->sanitize_comment_locale( $_POST['meta']['locale'] ) );
+
+        // phpcs:ignore WordPress.Security.NonceVerification.Missing
+        $locale_slug = $locale_exists ? $_POST['meta']['locale'] : null;
+
+        $set_slug = $locale_exists ? 'default' : null;
+
         // We were able to gather all information, let's put it in the cache.
-        $cache[ $post->ID ] = GP_Route_Translation_Helpers::get_permalink( $project->path, $original_id );
+        $cache[ $post->ID ] = GP_Route_Translation_Helpers::get_permalink( $project->path, $original_id, $set_slug, $locale_slug );
 
         return $cache[ $post->ID ];
@@ -562 +570 @@
         remove_action( 'comment_form_top', 'rosetta_comment_form_support_hint' );
 
-        $post   = self::maybe_get_temporary_post( self::get_shadow_post_id( $this->data['original_id'] ) );
+        $post          = self::maybe_get_temporary_post( self::get_shadow_post_id( $this->data['original_id'] ) );
+        $mentions_list = apply_filters( 'gp_mentions_list', array(), $comments, $this->data['locale_slug'], $this->data['original_id'] );
+
         $output = gp_tmpl_get_output(
             'translation-discussion-comments',
@@ -574 +584 @@
                 'project'              => $this->data['project'],
                 'translation_set_slug' => $this->data['translation_set_slug'],
+                'mentions_list'        => $mentions_list,
+
             ),
             $this->assets_dir . 'templates'

sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-wporg-customizations.php

@@ -44 +44 @@
                 2
             );
+
+            add_filter( 'jetpack_mentions_should_load_ui', '__return_true' );
+            add_filter(
+                'jetpack_mentions_allowed_post_types',
+                function( $post_types ) {
+                    $post_types[] = Helper_Translation_Discussion::POST_TYPE;
+                    return $post_types;
+                }
+            );
+
         }
     }

sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/includes/class-wporg-notifications.php

@@ -95 +95 @@
                 2
             );
+            add_filter(
+                'gp_mentions_list',
+                function( $result, $comments, $locale, $original_id ) {
+                    $validator_email_addresses  = ( $locale && $original_id ) ? WPorg_GlotPress_Notifications::get_validator_details_for_original_id( $locale, $original_id ) : array();
+                    $commenters_email_addresses = array_values( GP_Notifications::get_commenters_email_addresses( $comments ) );
+
+                    // Remove commenter email if it already exists as a GTE.
+                    $commenters_email_addresses = array_filter(
+                        $commenters_email_addresses,
+                        function( $commenter_email ) use ( $validator_email_addresses ) {
+                            return ( ! in_array( $commenter_email, array_column( $validator_email_addresses, 'email' ) ) );
+                        }
+                    );
+
+                    $commenters_email_role = array_map(
+                        function( $commenter_email ) {
+                            return(
+                            array(
+                                'role'  => 'commenter',
+                                'email' => $commenter_email,
+                            )
+                            );
+                        },
+                        $commenters_email_addresses
+                    );
+
+                    $all_email_addresses = array_merge(
+                        $validator_email_addresses,
+                        $commenters_email_role
+                    );
+
+                    $current_user       = wp_get_current_user();
+                    $current_user_email = $current_user->user_email;
+
+                    // Find all instances of the logged_in user in the array
+                    $user_search_result = array_keys( array_column( $all_email_addresses, 'email' ), $current_user_email );
+
+                    if ( false !== $user_search_result ) {
+                        foreach ( $user_search_result as $index ) {
+                            unset( $all_email_addresses[ $index ] );
+                        }
+                        $all_email_addresses = array_values( $all_email_addresses );
+                    }
+
+                    $users = array_map(
+                        function( $mentionable_user ) {
+                            $email = $mentionable_user;
+                            $role  = '';
+                            if ( is_array( $mentionable_user ) ) {
+                                $email = $mentionable_user['email'];
+                                $role  = ! ( 'commenter' === $mentionable_user['role'] ) ? ' - ' . $mentionable_user['role'] : '';
+                            }
+
+                                $user = get_user_by( 'email', $email );
+                                return array(
+                                    'ID'            => $user->ID,
+                                    'user_login'    => $user->user_login,
+                                    'user_nicename' => $user->user_nicename . $role,
+                                    'display_name'  => '',
+                                    'source'        => array( 'translators' ),
+                                    'image_URL'     => get_avatar_url( $user->ID ),
+                                );
+                        },
+                        $all_email_addresses
+                    );
+                            return $users;
+                },
+                10,
+                4
+            );
         }
     }
@@ -118 +188 @@
         return array_merge( $email_addresses, self::get_clpte_email_addresses_by_project( $original->id ) );
     }
+
+    /**
+     * Gets the email addresses and roles(GTE/PTE/CLPTE) of all project validators: GTE, PTE and CLPTE.
+     *
+     * @since 0.0.2
+     *
+     * @param string $locale  The locale for the translation.
+     * @param int    $original_id  The original id for the string.
+     *
+     * @return array    The emails and roles(GTE/PTE/CLPTE) of the validators.
+     */
+    public static function get_validator_details_for_original_id( $locale, $original_id ): array {
+        $gtes_email_and_role = array_map(
+            function( $gte_email ) {
+                return array(
+                    'role'  => 'GTE',
+                    'email' => $gte_email,
+                );
+            },
+            self::get_gte_email_addresses( $locale )
+        );
+
+        $ptes_email_and_role = array_map(
+            function( $pte_email ) {
+                return array(
+                    'role'  => 'GTE',
+                    'email' => $pte_email,
+                );
+            },
+            self::get_pte_email_addresses_by_project_and_locale( $original_id, $locale )
+        );
+
+        $clptes_email_and_role = array_map(
+            function( $clpte_email ) {
+                return array(
+                    'role'  => 'GTE',
+                    'email' => $clpte_email,
+                );
+            },
+            self::get_clpte_email_addresses_by_project( $original_id )
+        );
+
+        return array_merge(
+            array_merge( $gtes_email_and_role, $ptes_email_and_role ),
+            $clptes_email_and_role
+        );
+    }
+
 
     /**

sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/js/reject-feedback.js

@@ -23 +23 @@
 
             // Remove click event added to <summary> by wporg-gp-customizations plugin
-            $( $gp.editor.table ).off( 'click', 'summary' );
+            $( $gp.editor.table ).off( 'click', 'summary.feedback-summary' );
 
             $( '#bulk-actions-toolbar-top .button, #bulk-actions-toolbar-bottom .button' ).click(