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

well that was certainly fun. And the reason why likes and other acitivity deletions weren't propagating. Hopefully this is the last reason and there aren't more lurking further down the chain.

Browse Source
This commit is contained in:
friendica 2015-02-11 16:11:21 -08:00
parent 8c061f143f
commit c62d605608
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/zot.php
View File

@ -1582,7 +1582,7 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false,$reque
$arr['aid'] = $channel['channel_account_id'];
$arr['uid'] = $channel['channel_id'];
$item_id = delete_imported_item($sender,$arr,$channel['channel_id']);
$item_id = delete_imported_item($sender,$arr,$channel['channel_id'],$relay);
$result[] = array($d['hash'],(($item_id) ? 'deleted' : 'delete_failed'),$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']);
if($relay && $item_id) {
@ -1727,7 +1727,7 @@ function update_imported_item($sender,$item,$uid) {
}
function delete_imported_item($sender,$item,$uid) {
function delete_imported_item($sender,$item,$uid,$relay) {
logger('delete_imported_item invoked',LOGGER_DEBUG);
@ -1768,7 +1768,8 @@ function delete_imported_item($sender,$item,$uid) {
if($item_found) {
if($r[0]['item_restrict'] & ITEM_DELETED) {
logger('delete_imported_item: item was already deleted');
return false;
if(! $relay)
return false;
}
require_once('include/items.php');

2
mod/like.php
View File

@ -316,7 +316,7 @@ function like_content(&$a) {
// already liked it. Drop that item.
require_once('include/items.php');
foreach($r as $rr) {
drop_item($rr['id'],false,DROPITEM_PHASE1);
drop_item($rr['id'],true,DROPITEM_PHASE1);
}
if($interactive)
return;