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

port delete fixes from zap

Browse Source
This commit is contained in:
Mario Vavti 2019-06-12 12:46:29 +02:00
parent decd0dc035
commit bc34167c84
2 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Zotlabs/Lib/Libzot.php
View File

@ -2037,7 +2037,7 @@ class Libzot {
$item_found = false; $item_found = false;
$post_id = 0; $post_id = 0;
$r = q("select id, author_xchan, owner_xchan, source_xchan, item_deleted from item where ( author_xchan = '%s' or owner_xchan = '%s' or source_xchan = '%s' ) $r = q("select * from item where ( author_xchan = '%s' or owner_xchan = '%s' or source_xchan = '%s' )
and mid = '%s' and uid = %d limit 1", and mid = '%s' and uid = %d limit 1",
dbesc($sender), dbesc($sender),
dbesc($sender), dbesc($sender),
@ -2047,10 +2047,12 @@ class Libzot {
); );
if($r) { if($r) {
if($r[0]['author_xchan'] === $sender || $r[0]['owner_xchan'] === $sender || $r[0]['source_xchan'] === $sender) $stored = $r[0];
if($stored['author_xchan'] === $sender || $stored['owner_xchan'] === $sender || $stored['source_xchan'] === $sender)
$ownership_valid = true; $ownership_valid = true;
$post_id = $r[0]['id']; $post_id = $stored['id'];
$item_found = true; $item_found = true;
} }
else { else {
@ -2074,15 +2076,15 @@ class Libzot {
return false; return false;
} }
if ($item['obj_type'] == ACTIVITY_OBJ_EVENT) { if ($stored['resource_type'] === 'event') {
$i = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1", $i = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
dbesc($item['uuid']), dbesc($stored['resource_id']),
intval($uid) intval($uid)
); );
if ($i) { if ($i) {
if ($i[0]['event_xchan'] === $sender) { if ($i[0]['event_xchan'] === $sender) {
q("delete from event where event_hash = '%s' and uid = %d", q("delete from event where event_hash = '%s' and uid = %d",
dbesc($item['uuid']), dbesc($stored['resource_id']),
intval($uid) intval($uid)
); );
} }
@ -2094,7 +2096,7 @@ class Libzot {
} }
if($item_found) { if($item_found) {
if(intval($r[0]['item_deleted'])) { if(intval($stored['item_deleted'])) {
logger('delete_imported_item: item was already deleted'); logger('delete_imported_item: item was already deleted');
if(! $relay) if(! $relay)
return false; return false;
@ -2106,10 +2108,10 @@ class Libzot {
// back, and we aren't going to (or shouldn't at any rate) delete it again in the future - so losing // back, and we aren't going to (or shouldn't at any rate) delete it again in the future - so losing
// this information from the metadata should have no other discernible impact. // this information from the metadata should have no other discernible impact.
if (($r[0]['id'] != $r[0]['parent']) && intval($r[0]['item_origin'])) { if (($stored['id'] != $stored['parent']) && intval($stored['item_origin'])) {
q("update item set item_origin = 0 where id = %d and uid = %d", q("update item set item_origin = 0 where id = %d and uid = %d",
intval($r[0]['id']), intval($stored['id']),
intval($r[0]['uid']) intval($stored['uid'])
); );
} }
} }

23
include/zot.php
View File

@ -2241,7 +2241,7 @@ function delete_imported_item($sender, $item, $uid, $relay) {
$item_found = false; $item_found = false;
$post_id = 0; $post_id = 0;
$r = q("select id, author_xchan, owner_xchan, source_xchan, item_deleted from item where ( author_xchan = '%s' or owner_xchan = '%s' or source_xchan = '%s' ) $r = q("select * from item where ( author_xchan = '%s' or owner_xchan = '%s' or source_xchan = '%s' )
and mid = '%s' and uid = %d limit 1", and mid = '%s' and uid = %d limit 1",
dbesc($sender['hash']), dbesc($sender['hash']),
dbesc($sender['hash']), dbesc($sender['hash']),
@ -2251,10 +2251,13 @@ function delete_imported_item($sender, $item, $uid, $relay) {
); );
if($r) { if($r) {
if($r[0]['author_xchan'] === $sender['hash'] || $r[0]['owner_xchan'] === $sender['hash'] || $r[0]['source_xchan'] === $sender['hash'])
$stored = $r[0];
if($stored['author_xchan'] === $sender['hash'] || $stored['owner_xchan'] === $sender['hash'] || $stored['source_xchan'] === $sender['hash'])
$ownership_valid = true; $ownership_valid = true;
$post_id = $r[0]['id']; $post_id = $stored['id'];
$item_found = true; $item_found = true;
} }
else { else {
@ -2278,15 +2281,15 @@ function delete_imported_item($sender, $item, $uid, $relay) {
return false; return false;
} }
if ($item['obj_type'] == ACTIVITY_OBJ_EVENT) { if ($stored['resource_type'] === 'event') {
$i = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1", $i = q("SELECT * FROM event WHERE event_hash = '%s' AND uid = %d LIMIT 1",
dbesc($item['uuid']), dbesc($stored['resource_id']),
intval($uid) intval($uid)
); );
if ($i) { if ($i) {
if ($i[0]['event_xchan'] === $sender['hash']) { if ($i[0]['event_xchan'] === $sender['hash']) {
q("delete from event where event_hash = '%s' and uid = %d", q("delete from event where event_hash = '%s' and uid = %d",
dbesc($item['uuid']), dbesc($stored['resource_id']),
intval($uid) intval($uid)
); );
} }
@ -2300,7 +2303,7 @@ function delete_imported_item($sender, $item, $uid, $relay) {
require_once('include/items.php'); require_once('include/items.php');
if($item_found) { if($item_found) {
if(intval($r[0]['item_deleted'])) { if(intval($stored['item_deleted'])) {
logger('delete_imported_item: item was already deleted'); logger('delete_imported_item: item was already deleted');
if(! $relay) if(! $relay)
return false; return false;
@ -2312,10 +2315,10 @@ function delete_imported_item($sender, $item, $uid, $relay) {
// back, and we aren't going to (or shouldn't at any rate) delete it again in the future - so losing // back, and we aren't going to (or shouldn't at any rate) delete it again in the future - so losing
// this information from the metadata should have no other discernible impact. // this information from the metadata should have no other discernible impact.
if (($r[0]['id'] != $r[0]['parent']) && intval($r[0]['item_origin'])) { if (($stored['id'] != $stored['parent']) && intval($stored['item_origin'])) {
q("update item set item_origin = 0 where id = %d and uid = %d", q("update item set item_origin = 0 where id = %d and uid = %d",
intval($r[0]['id']), intval($stored['id']),
intval($r[0]['uid']) intval($stored['uid'])
); );
} }
} }