Merge pull request #10499 from realkinetix/sanitize-ap-followers-count

Sanitize negative followers count on APContact
This commit is contained in:
Hypolite Petovan 2021-07-15 15:14:22 -04:00 committed by GitHub
commit 8ae99fe711
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -266,6 +266,11 @@ class APContact
if (!empty($apcontact['following'])) {
$following = ActivityPub::fetchContent($apcontact['following']);
if (!empty($following['totalItems'])) {
// Mastodon seriously allows for this condition?
// Jul 14 2021 - See https://mastodon.social/@BLUW for a negative following count
if ($following['totalItems'] < 0) {
$following['totalItems'] = 0;
}
$apcontact['following_count'] = $following['totalItems'];
}
}
@ -273,6 +278,11 @@ class APContact
if (!empty($apcontact['followers'])) {
$followers = ActivityPub::fetchContent($apcontact['followers']);
if (!empty($followers['totalItems'])) {
// Mastodon seriously allows for this condition?
// Jul 14 2021 - See https://mastodon.online/@goes11 for a negative followers count
if ($followers['totalItems'] < 0) {
$followers['totalItems'] = 0;
}
$apcontact['followers_count'] = $followers['totalItems'];
}
}