Ticket #2493: meta-2493.2.patch

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-moderation/inc/class-plugin.php

@@ -19 +19 @@
         // Back-compat user option name.
         const USER_META = 'is_bozo';
 
+        // Meta key to store moderator's username on flag/unflag actions.
+        const MODERATOR_META = '_wporg_bbp_moderator';
+
         /**
          * Always return the same instance of this plugin.
          *
@@ -228 +231 @@
 
                 if ( ! $this->is_user_flagged( $user_id ) ) {
                         update_user_meta( $user_id, self::USER_META, true );
+                        update_user_meta( $user_id, self::MODERATOR_META, wp_get_current_user()->user_login );
                 }
                 do_action( 'wporg_bbp_flag_user', $user_id );
 
@@ -241 +245 @@
 
                 if ( $this->is_user_flagged( $user_id ) ) {
                         delete_user_meta( $user_id, self::USER_META );
+                        update_user_meta( $user_id, self::MODERATOR_META, wp_get_current_user()->user_login );
                 }
                 do_action( 'wporg_bbp_unflag_user', $user_id );
 

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/user-profile.php

@@ -11 +11 @@
 
 <div id="bbp-user-profile" class="bbp-user-profile">
         <h2 class="entry-title"><?php esc_html_e( 'Profile', 'wporg-forums' ); ?></h2>
-        <div class="bbp-user-section">
+        <div class="bbp-user-section"><?php
+                if ( class_exists( 'WordPressdotorg\Forums\User_Moderation\Plugin' ) ) {
+                        $is_user_flagged = WordPressdotorg\Forums\User_Moderation\Plugin::get_instance()->is_user_flagged( bbp_get_displayed_user_id() );
+                        $moderator       = get_user_meta( bbp_get_displayed_user_id(), '_wporg_bbp_moderator', true );
 
+                        if ( $is_user_flagged && $moderator ) {
+                                printf(
+                                        '<div class="bbp-template-notice info"><p>%s</p></div>',
+                                        /* translators: %s: moderator's username */
+                                        sprintf( __( 'This user has been flagged by %s.', 'wporg-forums' ), $moderator )
+                                );
+                        }
+                }
+                ?>
+
                 <?php if ( bbp_get_displayed_user_field( 'description' ) ) : ?>
 
                         <p class="bbp-user-description"><?php bbp_displayed_user_field( 'description' ); ?></p>

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php

@@ -235 +235 @@
         $is_moderator    = current_user_can( 'moderate' );
         $is_user_blocked = ! current_user_can( 'spectate' );
         $notice_class    = '';
-        $notice          = '';
+        $notices         = array();
 
         if ( $is_moderator && in_array( $post_status, array( 'archived', 'pending', 'spam' ) ) ) :
 
@@ -246 +246 @@
 
                         if ( $reporter ) {
                                 /* translators: %s: reporter's username */
-                                $notice = sprintf( __( 'This post has been flagged as spam by %s.', 'wporg-forums' ), $reporter );
+                                $notices[] = sprintf( __( 'This post has been flagged as spam by %s.', 'wporg-forums' ), $reporter );
                         } else {
-                                $notice = __( 'This post has been flagged as spam.', 'wporg-forums' );
+                                $notices[] = __( 'This post has been flagged as spam.', 'wporg-forums' );
                         }
                 } elseif ( 'archived' === $post_status ) {
                         $moderator = get_post_meta( get_the_ID(), '_wporg_bbp_moderator', true );
@@ -255 +255 @@
 
                         if ( $moderator ) {
                                 /* translators: %s: moderator's username */
-                                $notice = sprintf( __( 'This post has been archived by %s.', 'wporg-forums' ), $moderator );
+                                $notices[] = sprintf( __( 'This post has been archived by %s.', 'wporg-forums' ), $moderator );
                         } else {
-                                $notice = __( 'This post is currently archived.', 'wporg-forums' );
+                                $notices[] = __( 'This post is currently archived.', 'wporg-forums' );
                         }
                 } else {
                         $moderator = get_post_meta( get_the_ID(), '_wporg_bbp_moderator', true );
@@ -264 +264 @@
 
                         if ( $moderator ) {
                                 /* translators: %s: moderator's username */
-                                $notice = sprintf( __( 'This post has been unapproved by %s.', 'wporg-forums' ), $moderator );
+                                $notices[] = sprintf( __( 'This post has been unapproved by %s.', 'wporg-forums' ), $moderator );
                         } else {
-                                $notice = __( 'This post is currently pending.', 'wporg-forums' );
+                                $notices[] = __( 'This post is currently pending.', 'wporg-forums' );
                         }
                 }
 
+                if ( class_exists( 'WordPressdotorg\Forums\User_Moderation\Plugin' ) ) :
+                        $is_user_flagged = WordPressdotorg\Forums\User_Moderation\Plugin::get_instance()->is_user_flagged( get_post()->post_author );
+                        $moderator       = get_user_meta( get_post()->post_author, '_wporg_bbp_moderator', true );
+
+                        if ( $is_user_flagged && $moderator ) {
+                                /* translators: %s: moderator's username */
+                                $notices[] = sprintf( __( 'This user has been flagged by %s.', 'wporg-forums' ), $moderator );
+                        }
+                endif;
+
         elseif ( in_array( $post_status, array( 'pending', 'spam' ) ) ) :
 
                 if ( $is_user_blocked ) {
                         // Blocked users get a generic message with no call to action or moderation timeframe.
-                        $notice = __( 'This post has been held for moderation by our automated system.', 'wporg-forums' );
+                        $notices[] = __( 'This post has been held for moderation by our automated system.', 'wporg-forums' );
                 } elseif ( $hours_passed > 96 ) {
                         $notice_class = 'warning';
-                        $notice       = sprintf(
+                        $notices[]    = sprintf(
                                 /* translators: %s: https://make.wordpress.org/chat/ */
                                 __( 'This post was held for moderation by our automated system but has taken longer than expected to get approved. Please come to the #forums channel on <a href="%s">WordPress Slack</a> and let us know. Provide a link to the post.', 'wporg-forums' ),
                                 'https://make.wordpress.org/chat/'
                         );
                 } else {
-                        $notice = sprintf(
+                        $notices[] = sprintf(
                                 /* translators: %d: number of hours */
                                 _n( 'This post has been held for moderation by our automated system. It will be reviewed within %d hour.', 'This post has been held for moderation by our automated system. It will be reviewed within %d hours.', 72, 'wporg-forums' ),
                                 72
@@ -292 +302 @@
 
         endif;
 
-        if ( $notice ) {
+        if ( $notices ) {
                 printf(
                         '<div class="bbp-template-notice %s"><p>%s</p></div>',
                         esc_attr( $notice_class ),
-                        $notice
+                        implode( '</p><p>', $notices )
                 );
         }
 }