eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

[AP] Fix Follow collections

Browse Source 
Activitypub_profile:
- Fix subscription-counter getter functions, invalid profiles were being counted

apActorFollowingAction:
- Small rewrite of generate_following, didn't make sense to not use try-catch block

apActorFollowersAction:
- Small rewrite of generate_followers, didn't make sense to not use try-catch block
This commit is contained in:
tenma
2019-08-14 00:43:34 +01:00
committed by Diogo Cordeiro
parent 217c8a3933
commit 9733f3c02c
3 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/ActivityPub/actions/apactorfollowers.php
View File

@@ -116,18 +116,17 @@ class apActorFollowersAction extends ManagedAction
*/ */
public static function generate_followers($profile, $since, $limit) public static function generate_followers($profile, $since, $limit)
{ {
/* Fetch Followers */ $subs = [];
try { try {
$sub = Activitypub_profile::getSubscribers($profile, $since, $limit); $sub = Activitypub_profile::getSubscribers($profile, $since, $limit);
} catch (NoResultException $e) {
// Just let the exception go on its merry way
}
/* Get followers' URLs */ /* Get followers' URLs */
$subs = [];
foreach ($sub as $s) { foreach ($sub as $s) {
$subs[] = ActivityPubPlugin::actor_uri($s); $subs[] = ActivityPubPlugin::actor_uri($s);
} }
} catch (NoResultException $e) {
// Just let the exception go on its merry way
}
return $subs; return $subs;
} }

9
plugins/ActivityPub/actions/apactorfollowing.php
View File

@@ -116,18 +116,17 @@ class apActorFollowingAction extends ManagedAction
*/ */
public function generate_following($profile, $since, $limit) public function generate_following($profile, $since, $limit)
{ {
/* Fetch Following */ $subs = [];
try { try {
$sub = Activitypub_profile::getSubscribed($profile, $since, $limit); $sub = Activitypub_profile::getSubscribed($profile, $since, $limit);
} catch (NoResultException $e) {
// Just let the exception go on its merry way
}
/* Get followed' URLs */ /* Get followed' URLs */
$subs = [];
foreach ($sub as $s) { foreach ($sub as $s) {
$subs[] = ActivityPubPlugin::actor_uri($s); $subs[] = ActivityPubPlugin::actor_uri($s);
} }
} catch (NoResultException $e) {
// Just let the exception go on its merry way
}
return $subs; return $subs;
} }

6
plugins/ActivityPub/classes/Activitypub_profile.php
View File

@@ -505,9 +505,8 @@ class Activitypub_profile extends Managed_DataObject
$sub = new Subscription(); $sub = new Subscription();
$sub->subscribed = $profile->id; $sub->subscribed = $profile->id;
$sub->joinAdd(['subscriber', 'user:id'], 'LEFT');
$sub->joinAdd(['subscriber', 'activitypub_profile:profile_id'], 'LEFT');
$sub->whereAdd('subscriber != subscribed'); $sub->whereAdd('subscriber != subscribed');
$sub->whereAdd('subscriber IN (SELECT id FROM user UNION SELECT profile_id FROM activitypub_profile)');
$cnt = $sub->count('distinct subscriber'); $cnt = $sub->count('distinct subscriber');
self::cacheSet(sprintf('activitypub_profile:subscriberCount:%d', $profile->id), $cnt); self::cacheSet(sprintf('activitypub_profile:subscriberCount:%d', $profile->id), $cnt);
@@ -532,9 +531,8 @@ class Activitypub_profile extends Managed_DataObject
$sub = new Subscription(); $sub = new Subscription();
$sub->subscriber = $profile->id; $sub->subscriber = $profile->id;
$sub->joinAdd(['subscribed', 'user:id'], 'LEFT');
$sub->joinAdd(['subscribed', 'activitypub_profile:profile_id'], 'LEFT');
$sub->whereAdd('subscriber != subscribed'); $sub->whereAdd('subscriber != subscribed');
$sub->whereAdd('subscribed IN (SELECT id FROM user UNION SELECT profile_id FROM activitypub_profile)');
$cnt = $sub->count('distinct subscribed'); $cnt = $sub->count('distinct subscribed');
self::cacheSet(sprintf('activitypub_profile:subscriptionCount:%d', $profile->id), $cnt); self::cacheSet(sprintf('activitypub_profile:subscriptionCount:%d', $profile->id), $cnt);