Improve the display of boosted posts (#473)

akirk · Feb 18, 2025 · 70cec2d · 70cec2d
1 parent 19ea2b7
commit 70cec2d
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 12 deletions.
diff --git a/feed-parsers/class-feed-parser-activitypub.php b/feed-parsers/class-feed-parser-activitypub.php
@@ -2596,6 +2596,7 @@ public static function friends_post_author_meta( $friend_user ) {
 			array(
 				'url'     => $meta['attributedTo']['id'],
 				'name'    => $meta['attributedTo']['name'],
+				'handle'  => self::convert_actor_to_mastodon_handle( $meta['attributedTo']['id'] ),
 				'summary' => wp_strip_all_tags( $meta['attributedTo']['summary'] ),
 			)
 		);

diff --git a/friends.css b/friends.css
diff --git a/friends.css.map b/friends.css.map
diff --git a/friends.scss b/friends.scss
@@ -268,11 +268,11 @@ h2#page-title a.dashicons {
 			height: .5em;
 		}
 
-		.follow-button span.name {
+		.boosted .follow-button, .boosted .follow-button span.name {
 			display: none;
 		}
 
-		.follow-button:hover span.name {
+		.boosted:hover .follow-button {
 			display: inline;
 		}
 

diff --git a/includes/class-frontend.php b/includes/class-frontend.php
@@ -1546,7 +1546,6 @@ public function friend_posts_query( $query ) {
 				$query->set( 'author__not_in', $hide_from_friends_page );
 			}
 		}
-
 		return $query;
 	}
 }
diff --git a/templates/frontend/parts/activitypub/follow-link.php b/templates/frontend/parts/activitypub/follow-link.php
@@ -6,5 +6,25 @@
  * @package Friends
  */
 
-?>
-<a href="<?php echo esc_url( add_query_arg( 'url', $args['url'], admin_url( 'admin.php?page=add-friend' ) ) ); ?>" class="has-icon-left follow-button" title="<?php echo esc_attr( $args['summary'] ); ?>"><span class="dashicons dashicons-plus"></span><?php echo wp_kses( /* translators: %s is a username. */ sprintf( __( 'Follow %s', 'friends' ), '<span class="name">' . esc_html( $args['name'] ) . '</span>' ), array( 'span' => array( 'class' => true ) ) ); ?></a>
+?><span class="boosted" title="<?php echo esc_attr( $args['name'] . ' (' . $args['handle'] . '): ' . $args['summary'] ); ?>">
+	<?php
+	echo wp_kses(
+		sprintf(
+			// translators: %s is a username.
+			__( 'boosted %s', 'friends' ),
+			'<a href="' . esc_url( add_query_arg( 'url', $args['url'], admin_url( 'admin.php?page=add-friend' ) ) ) . '" class="has-icon-left follow-button" title="' . esc_attr( $args['summary'] ) . '"><span class="dashicons dashicons-plus"></span>' . wp_kses( /* translators: %s is a username. */ sprintf( __( 'Follow %s', 'friends' ), '<span class="name">' . esc_html( $args['name'] ) . '</span>' ), array( 'span' => array( 'class' => true ) ) ) . '</a>' .
+			'<a href="' . esc_url( $args['url'] ) . '" class="name">' . esc_html( $args['name'] ) . '</a>'
+		),
+		array(
+			'a'    => array(
+				'href'  => true,
+				'class' => true,
+			),
+			'span' => array(
+				'class' => true,
+			),
+
+		)
+	);
+	?>
+</span>
diff --git a/templates/frontend/parts/header-status.php b/templates/frontend/parts/header-status.php
@@ -67,11 +67,6 @@
 				<a href="<?php echo esc_attr( $friend_user->get_local_friends_page_url() ); ?>">
 					<strong><?php echo esc_html( $friend_user->display_name ); ?></strong>
 				</a>
-				<?php if ( $override_author_name && trim( str_replace( $override_author_name, '', $author_name ) ) === $author_name ) : ?>
-					<a href="<?php echo esc_attr( $friend_user->get_local_friends_page_url() ); ?>">
-					– <?php echo esc_html( $override_author_name ); ?>
-					</a>
-				<?php endif; ?>
 				<?php do_action( 'friends_post_author_meta', $friend_user ); ?>
 			<?php else : ?>
 				<a href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ); ?>">
-Original file line number
+Diff line change
@@ Expand Up / @@ -1546,7 +1546,6 @@ public function friend_posts_query( $query ) { @@
     				$query->set( 'author__not_in', $hide_from_friends_page );
     			}
     		}
     		return $query;
     	}
     }