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

more message restrict conversions

Browse Source
This commit is contained in:
friendica
2015-01-29 14:51:41 -08:00
parent a2cdd1499c
commit ff68ea6087
18 changed files with 76 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/zot.php
View File

@@ -1532,7 +1532,7 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false,$reque
}
}
if($arr['item_restrict'] & ITEM_DELETED) {
if(intval($arr['item_deleted'])) {
// remove_community_tag is a no-op if this isn't a community tag activity
remove_community_tag($sender,$arr,$channel['channel_id']);
@@ -1549,14 +1549,14 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false,$reque
continue;
}
$r = q("select id, edited, item_restrict, item_flags, mid, parent_mid from item where mid = '%s' and uid = %d limit 1",
$r = q("select * from item where mid = '%s' and uid = %d limit 1",
dbesc($arr['mid']),
intval($channel['channel_id'])
);
if($r) {
// We already have this post.
$item_id = $r[0]['id'];
if($r[0]['item_restrict'] & ITEM_DELETED) {
if(intval($r[0]['item_deleted'])) {
// It was deleted locally.
$result[] = array($d['hash'],'update ignored',$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>',$arr['mid']);
continue;
@@ -1686,7 +1686,7 @@ function delete_imported_item($sender,$item,$uid) {
logger('delete_imported_item invoked',LOGGER_DEBUG);
$r = q("select id, item_restrict from item where ( author_xchan = '%s' or owner_xchan = '%s' or source_xchan = '%s' )
$r = q("select id, item_deleted from item where ( author_xchan = '%s' or owner_xchan = '%s' or source_xchan = '%s' )
and mid = '%s' and uid = %d limit 1",
dbesc($sender['hash']),
dbesc($sender['hash']),
@@ -1700,7 +1700,7 @@ function delete_imported_item($sender,$item,$uid) {
return false;
}
if($r[0]['item_restrict'] & ITEM_DELETED) {
if(intval($r[0]['item_deleted'])) {
logger('delete_imported_item: item was already deleted');
return false;
}