Merge tag '1.8-beta2'

Author: philipjohn

assets/app.css

@@ -1,8 +1,10 @@
-/**
+/* *
 * Entries
 */
 
 .liveblog-entry {
+  display: flex;
+  padding: 1rem;
   background: #f7f7f7;
   border-top: 2px solid #eee;
   border-bottom: 2px solid #eee;
@@ -12,28 +14,29 @@
   border-top: 2px solid #111;
 }
 
-.liveblog-entry-edit {
-  margin-left: 60px;
+.liveblog-meta {
+  color: #666;
 }
 
-@media (max-width: 58.74em) {
-  .liveblog-entry-edit {
-    margin-left: 0;
-  }
+.liveblog-entry-aside {
+  flex-basis: 70px;
+  min-width: 70px;
+  margin-right: 10px;
 }
 
-.liveblog-entry-content {
-  padding-top: 10px;
-  padding-left: 60px;
+.liveblog-entry-main {
+  flex-grow: 1;
 }
 
-.liveblog-meta {
-  color: #666;
+.liveblog-entry-content * {
+  word-break: break-all;
 }
 
-.liveblog-meta-time {
-  -ms-flex-preferred-size: 60px;
-  flex-basis: 60px;
+.entry-content .liveblog-meta-time,
+.entry-content .liveblog-meta-time:hover,
+.entry-content .liveblog-meta-time:focus {
+  -webkit-box-shadow: none;
+  box-shadow: none;
 }
 
 .liveblog-meta-time span {
@@ -44,32 +47,29 @@
 .liveblog-meta-time span:first-child {
   font-weight: 600;
   color: #333;
-  padding-right: 5px;
   margin-bottom: 5px;
 }
 
+.liveblog-meta-authors {
+  margin-bottom: .5rem;
+}
+
+.liveblog-meta-author {
+  margin-right: 8px;
+}
+
 .liveblog-meta-author-name {
   font-size: 13px;
   margin-left: 8px;
 }
 
-.liveblog-meta-author-avatar {
+.liveblog-meta-authour-avatar {
   border-radius: 50%;
   overflow: hidden;
   width: 30px;
   height: 30px;
 }
 
-.liveblog-entry-tools {
-  margin-left: 60px;
-}
-
-@media (max-width: 58.74em) {
-  .liveblog-entry-tools {
-    margin-left: 0;
-  }
-}
-
 .liveblog-hash {
   color: #21759b;
 }

assets/app.js

@@ -122,7 +122,8 @@ public function filter( $entry ) {
 		// Map the authors and store them on the object
 		// for use in another function, we need
 		// them to be lowercased.
-		$this->authors = array_map( array( $this, 'map_authors' ), get_users( $args ) );
+		$authors       = apply_filters( 'liveblog_author_list', get_users( $args ), '' );
+		$this->authors = array_map( array( $this, 'map_authors' ), $authors );
 
 		// Map over every match and apply it via the
 		// preg_replace_callback method.
@@ -245,7 +246,8 @@ public function get_authors( $term ) {
 		}
 
 		// Map the authors into the expected format.
-		$users = array_map( array( $this, 'map_ajax_authors' ), get_users( $args ) );
+		$authors = apply_filters( 'liveblog_author_list', get_users( $args ), $term );
+		$users   = array_map( array( $this, 'map_ajax_authors' ), $authors );
 
 		return $users;
 	}

assets/app.js.map

@@ -13,6 +13,17 @@ class WPCOM_Liveblog_Entry {
 	 */
 	const replaces_meta_key = 'liveblog_replaces';
 
+	/**
+	 * @var string If author editing is enabled, we stored contributors
+	 *  in this meta key.
+	 */
+	const contributors_meta_key	= 'liveblog_contributors';
+
+	/**
+	 * @var string Whether or not an entry should show an author
+	 */
+	const hide_authors_key = 'liveblog_hide_authors';
+
 	private $comment;
 	private $type = 'new';
 	private static $allowed_tags_for_entry;
@@ -97,19 +108,20 @@ public function get_timestamp() {
 
 	public function for_json() {
 		$entry_id    = $this->replaces ? $this->replaces : $this->get_id();
-		$avatar_size = apply_filters( 'liveblog_entry_avatar_size', self::default_avatar_size );
 		$css_classes = implode( ' ', get_comment_class( '', $entry_id, $this->comment->comment_post_ID ) );
+		$share_link  = get_permalink( $this->get_post_id() ) . '#' . $entry_id;
+
 		$entry       = array(
 			'id'          => $entry_id,
-			'type'        => $this->get_type(),
-			'html'        => $this->render(),
+			'type' 	      => $this->get_type(),
+			'html' 	      => $this->render(),
 			'render'      => self::render_content( $this->get_content(), $this->comment ),
 			'content'     => apply_filters( 'liveblog_before_edit_entry', $this->get_content() ),
 			'css_classes' => $css_classes,
 			'timestamp'   => $this->get_timestamp(),
-			'avatar_img'  => get_avatar( $this->comment->comment_author_email, $avatar_size ),
-			'author_link' => get_comment_author_link( $entry_id ),
+			'authors'     => self::get_authors( $entry_id ),
 			'entry_time'  => get_comment_date( 'U', $entry_id ),
+			'share_link'  => $share_link,
 		);
 		$entry       = apply_filters( 'liveblog_entry_for_json', $entry, $this );
 		return (object) $entry;
@@ -122,18 +134,18 @@ public function get_fields_for_render() {
 		$comment_text = get_comment_text( $entry_id );
 		$css_classes  = implode( ' ', get_comment_class( '', $entry_id, $post_id ) );
 		$entry        = array(
-			'entry_id'               => $entry_id,
-			'post_id'                => $post_id,
-			'css_classes'            => $css_classes,
-			'content'                => self::render_content( $comment_text, $this->comment ),
-			'original_content'       => apply_filters( 'liveblog_before_edit_entry', $comment_text ),
-			'avatar_size'            => $avatar_size,
-			'avatar_img'             => get_avatar( $this->comment->comment_author_email, $avatar_size ),
-			'author_link'            => get_comment_author_link( $entry_id ),
-			'entry_date'             => get_comment_date( get_option( 'date_format' ), $entry_id ),
-			'entry_time'             => get_comment_date( get_option( 'time_format' ), $entry_id ),
-			'timestamp'              => $this->get_timestamp(),
-			'is_liveblog_editable'   => WPCOM_Liveblog::is_liveblog_editable(),
+			'entry_id'              => $entry_id,
+			'post_id'               => $post_id,
+			'css_classes'           => $css_classes ,
+			'content'               => self::render_content( $comment_text, $this->comment ),
+			'original_content'      => apply_filters( 'liveblog_before_edit_entry', $comment_text ),
+			'avatar_size'           => $avatar_size,
+			'avatar_img'            => WPCOM_Liveblog::get_avatar( $this->comment->comment_author_email, $avatar_size ),
+			'author_link'           => get_comment_author_link( $entry_id ),
+			'entry_date'            => get_comment_date( get_option('date_format'), $entry_id ),
+			'entry_time'            => get_comment_date( get_option('time_format'), $entry_id ),
+			'timestamp'             => $this->get_timestamp(),
+			'is_liveblog_editable'  => WPCOM_Liveblog::is_liveblog_editable(),
 			'allowed_tags_for_entry' => self::$allowed_tags_for_entry,
 		);
 
@@ -339,6 +351,126 @@ public static function handle_restricted_shortcodes( $args ) {
 		// Return the Original entry arguments with any modifications.
 		return $args;
 	}
+
+	/**
+	 * Return the user using author_id, if user not found then set as current
+	 * user as a fallback, we store a meta to show that authors are hidden as
+	 * a comment must have an author.
+	 *
+	 * If a entry_id is supplied we should update it as its the
+	 * original entry which is used for displaying author information.
+	 *
+	 *
+	 * @param array $args The new Live blog Entry.
+	 * @param int   $entry_id If set we should update the original entry
+	 * @return mixed
+	 */
+	private static function handle_author_select( $args, $entry_id ) {
+		if ( isset( $args['author_id'] ) && $args['author_id'] ) {
+			$user_object = self::get_userdata_with_filter( $args['author_id'] );
+			if ( $user_object ) {
+				$args['user'] = $user_object;
+
+				wp_update_comment( array(
+					'comment_ID' 		   => $entry_id,
+					'user_id'              => $args['user']->ID,
+					'comment_author'       => $args['user']->display_name,
+					'comment_author_email' => $args['user']->user_email,
+					'comment_author_url'   => $args['user']->user_url,
+				) );
+
+				update_comment_meta( $entry_id, self::hide_authors_key, false );
+			}
+		} else {
+			update_comment_meta( $entry_id, self::hide_authors_key, true );
+		}
+
+		if ( isset( $args['contributor_ids'] ) ) {
+			self::add_contributors( $entry_id, $args['contributor_ids'] );
+		}
+
+		return $args['user'];
+	}
+
+	/**
+	 * Store the contributors as comment meta.
+	 *
+	 * @param int $comment_id The comment id for the meta we should update.
+	 * @param array $contributors Array of ids to store as meta.
+	 */
+	private static function add_contributors( $comment_id, $contributors ) {
+		if ( ! $contributors ) {
+			delete_comment_meta( $comment_id, self::contributors_meta_key );
+		}
+
+		if ( is_array( $contributors ) ) {
+			if ( metadata_exists( 'comment', $comment_id, self::contributors_meta_key ) ) {
+				update_comment_meta( $comment_id, self::contributors_meta_key, $contributors );
+				return;
+			}
+
+			add_comment_meta( $comment_id, self::contributors_meta_key, $contributors, true );
+		}
+	}
+
+	/**
+	 * Returns a list of contributor user objects.
+	 *
+	 * @param int $comment_id The comment id to retrive the metadata.
+	 */
+	private static function get_contributors_for_json( $comment_id ) {
+		$contributors = get_comment_meta( $comment_id, self::contributors_meta_key, true );
+
+		if ( ! $contributors ) {
+			return array();
+		}
+
+		return array_map( function( $contributor ) {
+			$user_object = self::get_userdata_with_filter( $contributor );
+			return self::get_user_data_for_json( $user_object );
+		}, $contributors );
+	}
+
+	public static function get_userdata_with_filter( $author_id ) {
+		return apply_filters( 'liveblog_userdata', get_userdata( $author_id ), $author_id );
+	}
+
+	/**
+	 * Returns a formatted array of user data.
+	 *
+	 * @param object $user The user object
+	 */
+	private static function get_user_data_for_json( $user ) {
+		if ( is_wp_error( $user ) ) {
+			return array();
+		}
+
+		$avatar_size = apply_filters( 'liveblog_entry_avatar_size', self::default_avatar_size );
+		return array(
+			'id' => $user->ID,
+			'key' => strtolower($user->user_nicename),
+			'name' => $user->display_name,
+			'avatar' => WPCOM_Liveblog::get_avatar( $user->ID, $avatar_size ),
+		);
+	}
+
+	/**
+	 * Return an array of authors, based on the original comment author and its contributors.
+	 *
+	 * @param number $comment_id The id of the comment.
+	 */
+	public static function get_authors( $comment_id ) {
+		$hide_authors = get_comment_meta( $comment_id, self::hide_authors_key, true );
+
+		if ( $hide_authors ) {
+			return array();
+		}
+
+		$author = [ self::get_user_data_for_json( self::user_object_from_comment_id( $comment_id ) ) ];
+		$contributors = self::get_contributors_for_json( $comment_id );
+
+		return array_merge( $author, $contributors );
+	}
 }
 
 WPCOM_Liveblog_Entry::generate_allowed_tags_for_entry();

assets/theme.css

@@ -369,9 +369,11 @@ public static function crud_entry( WP_REST_Request $request ) {
 		$json        = $request->get_json_params();
 
 		$args = array(
-			'post_id'  => self::get_json_param( 'post_id', $json ),
-			'content'  => self::get_json_param( 'content', $json ),
-			'entry_id' => self::get_json_param( 'entry_id', $json ),
+			'post_id'         => self::get_json_param( 'post_id', $json ),
+			'content'         => self::get_json_param( 'content', $json ),
+			'entry_id'        => self::get_json_param( 'entry_id', $json ),
+			'author_id'       => self::get_json_param( 'author_id', $json ),
+			'contributor_ids' => self::get_json_param( 'contributor_ids', $json ),
 		);
 
 		self::set_liveblog_vars( $args['post_id'] );