harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tried this once before but had to revert. Basically prevent a comment from being relayed more than once - as it's a huge drain on resources. But last time I tried this, wall-to-wall comments stopped getting relayed. This checkin should do the right thing in both conditions.

Browse Source
This commit is contained in:
friendica 2014-10-19 17:31:10 -07:00
parent 26d626efe5
commit fd492386bf
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/zot.php
View File

@ -1476,11 +1476,13 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false) {
continue; continue;
} }
$r = q("select id, edited from item where mid = '%s' and uid = %d limit 1", $r = q("select id, edited, item_flags, mid, parent_mid from item where mid = '%s' and uid = %d limit 1",
dbesc($arr['mid']), dbesc($arr['mid']),
intval($channel['channel_id']) intval($channel['channel_id'])
); );
if($r) { if($r) {
// We already have this post.
// Maybe it has been edited?
$item_id = $r[0]['id']; $item_id = $r[0]['id'];
if($arr['edited'] > $r[0]['edited']) { if($arr['edited'] > $r[0]['edited']) {
$arr['id'] = $r[0]['id']; $arr['id'] = $r[0]['id'];
@ -1492,6 +1494,10 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false) {
} }
else { else {
$result[] = array($d['hash'],'update ignored',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']); $result[] = array($d['hash'],'update ignored',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']);
// We need this line to ensure wall-to-wall comments are relayed (by falling through to the relay bit),
// and at the same time not relay any other relayable posts more than once, because to do so is very wasteful.
if(! ($r[0]['item_flags'] & ITEM_ORIGIN))
continue;
} }
} }
else { else {