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

do not use cache for new followers

Browse source
This commit is contained in:
Matthias Pfefferle 2023-05-31 14:03:46 +02:00
parent 084f108161
commit 758912da64
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/class-mention.php
View file

@ -114,7 +114,7 @@ class Mention {
* @return string The Inbox-URL * @return string The Inbox-URL
*/ */
public static function get_inbox_by_mentioned_actor( $actor ) { public static function get_inbox_by_mentioned_actor( $actor ) {
$metadata = get_remote_metadata_by_actor( $actor, true ); $metadata = get_remote_metadata_by_actor( $actor );
if ( \is_wp_error( $metadata ) ) { if ( \is_wp_error( $metadata ) ) {
return $metadata; return $metadata;

4
includes/class-scheduler.php
View file

@ -100,7 +100,7 @@ class Scheduler {
$followers = Followers::get_outdated_followers(); $followers = Followers::get_outdated_followers();
foreach ( $followers as $follower ) { foreach ( $followers as $follower ) {
$meta = get_remote_metadata_by_actor( $follower->get_actor() ); $meta = get_remote_metadata_by_actor( $follower->get_actor(), true );
if ( empty( $meta ) || ! is_array( $meta ) || is_wp_error( $meta ) ) { if ( empty( $meta ) || ! is_array( $meta ) || is_wp_error( $meta ) ) {
$follower->set_error( $meta ); $follower->set_error( $meta );
@ -121,7 +121,7 @@ class Scheduler {
$followers = Followers::get_faulty_followers(); $followers = Followers::get_faulty_followers();
foreach ( $followers as $follower ) { foreach ( $followers as $follower ) {
$meta = get_remote_metadata_by_actor( $follower->get_actor() ); $meta = get_remote_metadata_by_actor( $follower->get_actor(), true );
if ( is_tombstone( $meta ) ) { if ( is_tombstone( $meta ) ) {
$follower->delete(); $follower->delete();

8
includes/functions.php
View file

@ -54,11 +54,12 @@ function get_webfinger_resource( $user_id ) {
/** /**
* Requests the Meta-Data from the Actors profile * Requests the Meta-Data from the Actors profile
* *
* @param string $actor The Actor URL * @param string $actor The Actor URL.
* @param bool $cached If the result should be cached.
* *
* @return array The Actor profile as array * @return array The Actor profile as array
*/ */
function get_remote_metadata_by_actor( $actor ) { function get_remote_metadata_by_actor( $actor, $cached = true ) {
$pre = apply_filters( 'pre_get_remote_metadata_by_actor', false, $actor ); $pre = apply_filters( 'pre_get_remote_metadata_by_actor', false, $actor );
if ( $pre ) { if ( $pre ) {
return $pre; return $pre;
@ -75,12 +76,15 @@ function get_remote_metadata_by_actor( $actor ) {
return $actor; return $actor;
} }
// only check the cache if needed.
if ( $cached ) {
$transient_key = 'activitypub_' . $actor; $transient_key = 'activitypub_' . $actor;
$metadata = \get_transient( $transient_key ); $metadata = \get_transient( $transient_key );
if ( $metadata ) { if ( $metadata ) {
return $metadata; return $metadata;
} }
}
if ( ! \wp_http_validate_url( $actor ) ) { if ( ! \wp_http_validate_url( $actor ) ) {
$metadata = new \WP_Error( 'activitypub_no_valid_actor_url', \__( 'The "actor" is no valid URL', 'activitypub' ), $actor ); $metadata = new \WP_Error( 'activitypub_no_valid_actor_url', \__( 'The "actor" is no valid URL', 'activitypub' ), $actor );