Event-Federation/wordpress-activitypub
Event-Federation/wordpress-activitypub
7
1
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity Actions

rename function, inserts users into reply text

Browse source
This commit is contained in:
Django Doucet 2023-03-10 10:14:46 -07:00
parent 116070e23c
commit 1ac6882f3a
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/class-admin.php
View file

@ -166,7 +166,7 @@ class Admin {
* Reply to ActivityPub Comments from the edit-comments.php screen * Reply to ActivityPub Comments from the edit-comments.php screen
*/ */
public static function reply_comments_actions( $actions, $comment ) { public static function reply_comments_actions( $actions, $comment ) {
$recipients = \Activitypub\get_recipients( $comment->comment_ID ); $recipients = \Activitypub\reply_recipients( $comment->comment_ID );
$summary = \Activitypub\get_summary( $comment->comment_ID ); $summary = \Activitypub\get_summary( $comment->comment_ID );
$reply_button = '<button type="button" data-comment-id="%d" data-post-id="%d" data-action="%s" class="%s button-link" aria-expanded="false" aria-label="%s" data-recipients="%s" data-summary="%s">%s</button>'; $reply_button = '<button type="button" data-comment-id="%d" data-post-id="%d" data-action="%s" class="%s button-link" aria-expanded="false" aria-label="%s" data-recipients="%s" data-summary="%s">%s</button>';
$actions['reply'] = \sprintf( $actions['reply'] = \sprintf(

27
includes/functions.php
View file

@ -529,13 +529,13 @@ function is_ap_replies() {
} }
/** /**
* Get tagged users from received AP object meta * Get recipients to insert/tag in reply tag from received AP object meta
* @param string $object_id a comment_id to search * @param string $object_id a comment_id to search
* @param boolean $post defaults to searching a comment_id * @param boolean $post defaults to searching a comment_id
* @return array of tagged users * @return string space separated webfinger of tagged users
*/ */
function get_recipients( $object_id, $post = null ) { function reply_recipients( $object_id, $post = null ) { //TODO rename to avoid confusion with \Activitypub\Inbox::extract_recipients
$tagged_users_name = null; $recipients = null;
if ( $post ) { if ( $post ) {
//post //post
$ap_object = \unserialize( \get_post_meta( $object_id, 'ap_object', true ) ); $ap_object = \unserialize( \get_post_meta( $object_id, 'ap_object', true ) );
@ -545,19 +545,26 @@ function get_recipients( $object_id, $post = null ) {
} }
if ( ! empty( $ap_object ) ) { if ( ! empty( $ap_object ) ) {
$tagged_users_name[] = \Activitypub\url_to_webfinger( $ap_object['actor'] ); // Replying to remote comments.
if ( ! empty( $ap_object['object']['tag'] ) ) { $recipients[] = \ActivityPub\url_to_webfinger( $ap_object['actor'] ); // Reply to Object actor!
$author_post_url = \get_author_posts_url( $ap_object['user_id'] );
foreach ( $ap_object['object']['tag'] as $tag ) { if ( ! empty( $ap_object['object']['tag'] ) ) { // Reply to other tagged users.
$author_post_url = \get_author_posts_url( $ap_object['user_id'] );// ignore self tag.
foreach ( $ap_object['object']['tag'] as $tag ) { // Other tagged users
if ( $author_post_url === $tag['href'] ) { if ( $author_post_url === $tag['href'] ) {
continue; continue;
} }
if ( in_array( 'Mention', $tag ) ) { if ( in_array( 'Mention', $tag ) ) {
$tagged_users_name[] = $tag['name']; $recipients[] = $tag['name'];
} }
} }
} }
return implode( ' ', $tagged_users_name ); return implode( ' ', $recipients );
} else {
// Replying to self with others.
$comment = \get_comment( $object_id );
preg_match_all( '/@' . ACTIVITYPUB_USERNAME_REGEXP . '/', $comment->comment_content, $recipients );
return implode( ' ', $recipients[0] );
} }
} }