← All changes | includes/class-mention.php +55 -73 1.3.0 → 7.7.0 View file →

		@@ -1,99 +1,78 @@
1	1	<?php
	2	+/**
	3	+ * Mention class file.
	4	+ *
	5	+ * @package Activitypub
	6	+ */
	7	+
2	8	namespace Activitypub;
3	9
4	10	use WP_Error;
5		-use Activitypub\Webfinger;
6	11
7	12	/**
8		- * ActivityPub Mention Class
	13	+ * ActivityPub Mention Class.
9	14	*
10	15	* @author Alex Kirk
11	16	*/
12	17	class Mention {
13	18	/**
14		- * Initialize the class, registering WordPress hooks
	19	+ * Initialize the class, registering WordPress hooks.
15	20	*/
16	21	public static function init() {
17		- \add_filter( 'the_content', array( self::class, 'the_content' ), 99, 2 );
	22	+ \add_filter( 'the_content', array( self::class, 'the_content' ), 99 );
	23	+ \add_filter( 'comment_text', array( self::class, 'the_content' ) );
	24	+ \add_filter( 'activitypub_extra_field_content', array( self::class, 'the_content' ) );
18	25	\add_filter( 'activitypub_extract_mentions', array( self::class, 'extract_mentions' ), 99, 2 );
	26	+ \add_filter( 'activitypub_activity_object_array', array( self::class, 'filter_activity_object' ), 99 );
19	27	}
20	28
21	29	/**
22		- * Filter to replace the mentions in the content with links
	30	+ * Filter only the activity object and replace summery it with URLs
	31	+ * add tag to user.
23	32	*
24		- * @param string $the_content the post-content
	33	+ * @param array $object_array Array of activity.
25	34	*
26		- * @return string the filtered post-content
	35	+ * @return array The activity object array.
27	36	*/
28		- public static function the_content( $the_content ) {
29		- // small protection against execution timeouts: limit to 1 MB
30		- if ( mb_strlen( $the_content ) > MB_IN_BYTES ) {
31		- return $the_content;
	37	+ public static function filter_activity_object( $object_array ) {
	38	+ if ( ! empty( $object_array['summary'] ) ) {
	39	+ $object_array['summary'] = self::the_content( $object_array['summary'] );
32	40	}
33		- $tag_stack = array();
34		- $protected_tags = array(
35		- 'pre',
36		- 'code',
37		- 'textarea',
38		- 'style',
39		- 'a',
40		- );
41		- $content_with_links = '';
42		- $in_protected_tag = false;
43		- foreach ( wp_html_split( $the_content ) as $chunk ) {
44		- if ( preg_match( '#^<!--[\s\S]*-->$#i', $chunk, $m ) ) {
45		- $content_with_links .= $chunk;
46		- continue;
47		- }
48	41
49		- if ( preg_match( '#^<(/)?([a-z-]+)\b[^>]*>$#i', $chunk, $m ) ) {
50		- $tag = strtolower( $m[2] );
51		- if ( '/' === $m[1] ) {
52		- // Closing tag.
53		- $i = array_search( $tag, $tag_stack );
54		- // We can only remove the tag from the stack if it is in the stack.
55		- if ( false !== $i ) {
56		- $tag_stack = array_slice( $tag_stack, 0, $i );
57		- }
58		- } else {
59		- // Opening tag, add it to the stack.
60		- $tag_stack[] = $tag;
61		- }
	42	+ if ( ! empty( $object_array['content'] ) ) {
	43	+ $object_array['content'] = self::the_content( $object_array['content'] );
	44	+ }
62	45
63		- // If we're in a protected tag, the tag_stack contains at least one protected tag string.
64		- // The protected tag state can only change when we encounter a start or end tag.
65		- $in_protected_tag = array_intersect( $tag_stack, $protected_tags );
	46	+ return $object_array;
	47	+ }
66	48
67		- // Never inspect tags.
68		- $content_with_links .= $chunk;
69		- continue;
70		- }
71		-
72		- if ( $in_protected_tag ) {
73		- // Don't inspect a chunk inside an inspected tag.
74		- $content_with_links .= $chunk;
75		- continue;
76		- }
77		-
78		- // Only reachable when there is no protected tag in the stack.
79		- $content_with_links .= \preg_replace_callback( '/@' . ACTIVITYPUB_USERNAME_REGEXP . '/', array( self::class, 'replace_with_links' ), $chunk );
80		- }
81		-
82		- return $content_with_links;
	49	+ /**
	50	+ * Filter to replace the mentions in the content with links.
	51	+ *
	52	+ * @param string $the_content The post content.
	53	+ *
	54	+ * @return string The filtered post-content.
	55	+ */
	56	+ public static function the_content( $the_content ) {
	57	+ return enrich_content_data( $the_content, '/@' . ACTIVITYPUB_USERNAME_REGEXP . '/', array( self::class, 'replace_with_links' ) );
83	58	}
84	59
85	60	/**
86		- * A callback for preg_replace to build the user links
	61	+ * A callback for preg_replace to build the user links.
87	62	*
88		- * @param array $result the preg_match results
	63	+ * @param array $result The preg_match results.
89	64	*
90		- * @return string the final string
	65	+ * @return string The final string.
91	66	*/
92	67	public static function replace_with_links( $result ) {
93	68	$metadata = get_remote_metadata_by_actor( $result[0] );
94	69
95		- if ( ! empty( $metadata ) && ! is_wp_error( $metadata ) && ! empty( $metadata['url'] ) ) {
	70	+ if (
	71	+ ! empty( $metadata ) &&
	72	+ ! is_wp_error( $metadata ) &&
	73	+ ( ! empty( $metadata['id'] ) || ! empty( $metadata['url'] ) )
	74	+ ) {
96	75	$username = ltrim( $result[0], '@' );
97	76	if ( ! empty( $metadata['name'] ) ) {
98	77	$username = $metadata['name'];
99	78	}
		@@ -99,9 +78,12 @@
99	78	}
100	79	if ( ! empty( $metadata['preferredUsername'] ) ) {
101	80	$username = $metadata['preferredUsername'];
102	81	}
103		- return \sprintf( '<a rel="mention" class="u-url mention" href="%s">@<span>%s</span></a>', esc_url( $metadata['url'] ), esc_html( $username ) );
	82	+
	83	+ $url = isset( $metadata['url'] ) ? object_to_uri( $metadata['url'] ) : object_to_uri( $metadata['id'] );
	84	+
	85	+ return \sprintf( '<a rel="mention" class="u-url mention" href="%1$s">@%2$s</a>', esc_url( $url ), esc_html( $username ) );
104	86	}
105	87
106	88	return $result[0];
107	89	}
		@@ -106,13 +88,13 @@
106	88	return $result[0];
107	89	}
108	90
109	91	/**
110		- * Get the Inboxes for the mentioned Actors
	92	+ * Get the Inboxes for the mentioned Actors.
111	93	*
112		- * @param array $mentioned The list of Actors that were mentioned
	94	+ * @param array $mentioned The list of Actors that were mentioned.
113	95	*
114		- * @return array The list of Inboxes
	96	+ * @return array The list of Inboxes.
115	97	*/
116	98	public static function get_inboxes( $mentioned ) {
117	99	$inboxes = array();
118	100
		@@ -127,13 +109,13 @@
127	109	return $inboxes;
128	110	}
129	111
130	112	/**
131		- * Get the inbox from the Remote-Profile of a mentioned Actor
	113	+ * Get the inbox from the Remote-Profile of a mentioned Actor.
132	114	*
133		- * @param string $actor The Actor-URL
	115	+ * @param string $actor The Actor URL.
134	116	*
135		- * @return string The Inbox-URL
	117	+ * @return string|WP_Error The Inbox-URL or WP_Error if not found.
136	118	*/
137	119	public static function get_inbox_by_mentioned_actor( $actor ) {
138	120	$metadata = get_remote_metadata_by_actor( $actor );
139	121
		@@ -140,9 +122,9 @@
140	122	if ( \is_wp_error( $metadata ) ) {
141	123	return $metadata;
142	124	}
143	125
144		- if ( isset( $metadata['endpoints'] ) && isset( $metadata['endpoints']['sharedInbox'] ) ) {
	126	+ if ( isset( $metadata['endpoints']['sharedInbox'] ) ) {
145	127	return $metadata['endpoints']['sharedInbox'];
146	128	}
147	129
148	130	if ( \array_key_exists( 'inbox', $metadata ) ) {
		@@ -154,12 +136,12 @@
154	136
155	137	/**
156	138	* Extract the mentions from the post_content.
157	139	*
158		- * @param array $mentions The already found mentions.
	140	+ * @param array $mentions The already found mentions.
159	141	* @param string $post_content The post content.
160	142	*
161		- * @return mixed The discovered mentions.
	143	+ * @return array The discovered mentions.
162	144	*/
163	145	public static function extract_mentions( $mentions, $post_content ) {
164	146	\preg_match_all( '/@' . ACTIVITYPUB_USERNAME_REGEXP . '/i', $post_content, $matches );
165	147	foreach ( $matches[0] as $match ) {
		@@ -167,7 +149,7 @@
167	149	if ( ! is_wp_error( $link ) ) {
168	150	$mentions[ $match ] = $link;
169	151	}
170	152	}
171		- return $mentions;
	153	+ return \array_unique( $mentions );
172	154	}
173	155	}