Multiples follows shouldn't be send anymore
This commit is contained in:
parent
58eaf0ba1c
commit
04f34de3a1
1 changed files with 14 additions and 6 deletions
|
@ -343,6 +343,8 @@ class Processor
|
||||||
$item['body'] = $activity['source'];
|
$item['body'] = $activity['source'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$stored = false;
|
||||||
|
|
||||||
foreach ($activity['receiver'] as $receiver) {
|
foreach ($activity['receiver'] as $receiver) {
|
||||||
$item['uid'] = $receiver;
|
$item['uid'] = $receiver;
|
||||||
$item['contact-id'] = Contact::getIdForURL($activity['author'], $receiver, true);
|
$item['contact-id'] = Contact::getIdForURL($activity['author'], $receiver, true);
|
||||||
|
@ -357,9 +359,14 @@ class Processor
|
||||||
|
|
||||||
$item_id = Item::insert($item);
|
$item_id = Item::insert($item);
|
||||||
Logger::log('Storing for user ' . $item['uid'] . ': ' . $item_id);
|
Logger::log('Storing for user ' . $item['uid'] . ': ' . $item_id);
|
||||||
|
|
||||||
|
if ($item_id) {
|
||||||
|
$stored = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$item['private'] && ($item['gravity'] == GRAVITY_PARENT) && ($item['author-link'] != $item['owner-link'])) {
|
// Store send a follow request for every reshare - but only when the item had been stored
|
||||||
|
if ($stored && !$item['private'] && ($item['gravity'] == GRAVITY_PARENT) && ($item['author-link'] != $item['owner-link'])) {
|
||||||
$author = APContact::getByURL($item['owner-link'], false);
|
$author = APContact::getByURL($item['owner-link'], false);
|
||||||
// We send automatic follow requests for reshared messages. (We don't need though for forum posts)
|
// We send automatic follow requests for reshared messages. (We don't need though for forum posts)
|
||||||
if ($author['type'] != 'Group') {
|
if ($author['type'] != 'Group') {
|
||||||
|
@ -662,12 +669,13 @@ class Processor
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($parent_terms as $term) {
|
foreach ($parent_terms as $term) {
|
||||||
$contact = Contact::getDetailsByURL($term['url']);
|
$contact = Contact::getDetailsByURL($term['url'], 0);
|
||||||
|
if (!empty($contact)) {
|
||||||
$implicit_mentions[] = $contact['url'];
|
$implicit_mentions[] = $contact['url'];
|
||||||
$implicit_mentions[] = $contact['nurl'];
|
$implicit_mentions[] = $contact['nurl'];
|
||||||
$implicit_mentions[] = $contact['alias'];
|
$implicit_mentions[] = $contact['alias'];
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return $implicit_mentions;
|
return $implicit_mentions;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue