Merge pull request #9038 from annando/check-announcer

Fix sharing detection on reshares
This commit is contained in:
Hypolite Petovan 2020-08-19 23:01:24 -04:00 committed by GitHub
commit f91b3130f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2026,13 +2026,13 @@ class Item
return; return;
} }
if (Contact::getIdForURL($parent['author-link'], $item['uid'])) { if (($author['contact-type'] != Contact::TYPE_COMMUNITY) && Contact::isSharing($parent['author-link'], $item['uid'])) {
logger::info('The parent author is a user contact: quit', ['author' => $parent['author-link'], 'uid' => $item['uid']]); logger::info('The parent author is a user contact: quit', ['author' => $parent['author-link'], 'uid' => $item['uid']]);
return; return;
} }
$cid = Contact::getIdForURL($author['url'], $item['uid']); $cid = Contact::getIdForURL($author['url'], $item['uid']);
if (empty($cid)) { if (empty($cid) || !Contact::isSharing($cid, $item['uid'])) {
logger::info('The resharer is not a user contact: quit', ['resharer' => $author['url'], 'uid' => $item['uid']]); logger::info('The resharer is not a user contact: quit', ['resharer' => $author['url'], 'uid' => $item['uid']]);
return; return;
} }